gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /dev-haskell
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
569 files changed, 1278 insertions, 5310 deletions
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index cc9897777112..af131aab3f37 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/base16-bytestring/Manifest b/dev-haskell/base16-bytestring/Manifest
index ee2df41905f1..658641a5db23 100644
--- a/dev-haskell/base16-bytestring/Manifest
+++ b/dev-haskell/base16-bytestring/Manifest
@@ -1,3 +1,3 @@
-DIST base16-bytestring-0.1.1.6.tar.gz 3694 BLAKE2B 81ea5573cc853a6fb55400b28b7a667ba175a6ae65547dd7ae8b450a72d950c4513bf464f1646c4f8167a2e477974180d85a1884a22b468c5646a5c8b6da2186 SHA512 699bc1f7819a1c0cea0154626f8799301bc9360bc997a5e9313a605ec33ea04d77219b100693021fd43e01d8d979374db07e6e3fabef5301c411f335e30a8cba
-EBUILD base16-bytestring-0.1.1.6.ebuild 588 BLAKE2B 6130f9f75cdd13d8bf5713a2624d8d499146ba4b1ff47bd72d0dbe10cdf02624d0d60a9ed29d498919acf978e3d11d10d7442d6bd3a67bd830255eeaad0c81b0 SHA512 4de209c64eea7b25f1ea4aded00870ac89a705f60bfbabed1a57dcb6d9978a4d210c903ce660df3250642b79b533df05a57f8c5390eca03032306f7db91b4fd4
+DIST base16-bytestring-0.1.1.7.tar.gz 5136 BLAKE2B 65fbfb5288cae1cd17d4955c9ec55a40d00cd90556dd6c3923d110988612859e2301f4d9c2317a0b24f6dc1532fbb82b3b53133499c24ba276eb1f6754707a1f SHA512 33c4c1e35489cee42ced9fffed3ee11bfe976dc167adc3ab715c224e69025fd9634cb010ee09bf86aa71170e12172c823964fdc3bed4611c599f686beea2985e
+EBUILD base16-bytestring-0.1.1.7.ebuild 599 BLAKE2B bedea68615054879316c7dfb8575a8c6f44194e4f01e1c452aea301bf382c3edc2995cf6ae2df4f97ee3a68cee7f1c2fb50656197a00d6b085c1eecbe1f3c01f SHA512 05117284393ad44d393438792a9abd4af37b6d160557863cc0fce064f2aa7b94a14ab1b1457cfd469809c5114360d3e248470f5927c7c6a881f8aa08aba5fc20
 MISC metadata.xml 335 BLAKE2B 72271f1566bd16b36199732b30f59b24040d75ed103efa27ce9e41bc9226dff52b4abdd197a8ad4624539c8ec854e5867d9e686b04f42b942ca09de395fc8d96 SHA512 c61d1eaadc9651d07566873f20438dc9b77d5df7be1dd3f7d18f8b6a8511933ff38662c23356ee6900e92a93ab852a19fc25b1525c7f8a9f4f4c44aef8816c8f
diff --git a/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild b/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.7.ebuild
index 1edae186f55f..e05e533222a1 100644
--- a/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild
+++ b/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.7.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.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Fast base16 (hex) encoding and decoding for ByteStrings"
-HOMEPAGE="https://github.com/bos/base16-bytestring"
+HOMEPAGE="https://github.com/haskell/base16-bytestring"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -17,8 +17,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:=
+RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
+	>=dev-haskell/cabal-1.12
 "
diff --git a/dev-haskell/binary/Manifest b/dev-haskell/binary/Manifest
index be732f89afc2..6cec0c0cbcef 100644
--- a/dev-haskell/binary/Manifest
+++ b/dev-haskell/binary/Manifest
@@ -1,15 +1,3 @@
-DIST binary-0.5.1.1.tar.gz 34239 BLAKE2B 8c55abeff9c02cadd18c62d9c38e5c344d7105be620f2db73066cb559f7755c72570b6898960377240e5b828a8fb3a4ace3efaa360cd1a8d35da6b1480d6da52 SHA512 a177770f2fc220402d2ab256f47ead219176709ecada9994ad5b70a22d9c613e98b4d3b513f45ec4f684d2458e8971c71b0b30cf2d76a79224a424f56360a334
-DIST binary-0.7.1.0.tar.gz 43647 BLAKE2B 7a2b9ed2ab23425318fcfd095beccb3f2c2870cc3687bc84c3adca24a5614b748c85f0252c2c36d37e95aa95b3ed4fa0f44735c670fce02d4ccff22141534316 SHA512 711d64c51cb6cf8811252fe3cbb0575dade897666566610f8dee51c2965d0e3dc1dc40df72713e9e6abbd0bfe494dd4feee70128d21f1ea16305bde3409557b3
-DIST binary-0.7.2.3.tar.gz 47622 BLAKE2B 8d98846d020af95624208ed841b84378ecfd09994bdacc3de8d67ddcb017cdc1acaa5ec8599ade4033d7c1f247dd930fad819212bfb6ef79356c8d931a20f4ef SHA512 1babe32d1c2c0537091c96a3191285f2f61a9c85ca503c89c57c32e60d8f16ee429dd8fb645563d96714122a06ca6c9f0ab1c04077b4f0ed22d4b0b41ef2c18f
-DIST binary-0.7.5.0.tar.gz 45764 BLAKE2B 824e3bc9c910ddb86d2799101bf8c76ad7e10f81911fed0da3d1ea07c5586a4ad645407b1fa53a853adf5e83bc1b77411e9812ebe7d15923e508e3376110e827 SHA512 232e7c3da1c0055f3e9f211a86e81c76bc44ab1b70cabd23c93634dbaa42eed8bd9314fbedc16b9703d3ca92b0bbf232e6c30bb1384687dad0e6e85c9abb8947
-DIST binary-0.7.6.1.tar.gz 47086 BLAKE2B 7d81b9c254902d5ff2bafbef4c31a6f6f0396202d8585690c1ae3b63ae6ed157db7221d65a62e393ee8f6725ffd5d80e51030c0351e954b06004fcb70e5867cd SHA512 655daa93a52b845a85d440810452933d7bc3398ad1b51e1e955b2d19a0a32679325a0d1751ad50d252531e493528262e14dab32af4b9a515855fe7f64e0730b2
-DIST binary-0.8.3.0.tar.gz 51900 BLAKE2B 47e7db8a79e19bbe8cfde3f0b5d3c1edd441606ec0d70f5f02cdad3856dbb35a451b667c33beaf26d8fb57497bde5f3a03df704c458337e065776bb98b308135 SHA512 9b16143067fc974d2dbb4bd42833454a4516eea7ead7674079911b969c42547ededb87f95cd5767553f2105e2f9bb5b2ba08b9666714aa30e56143e606711d44
 DIST binary-0.8.7.0.tar.gz 57443 BLAKE2B 27d892ff28410e37fa9c8f3b852bf6c420fee8c7241815737c7c488e0e1754685ad4efe6a93eed055638870c0b64dc311e1c6e6bc6bf498420f1640557d4ef27 SHA512 2648ea70b6615c01a0e336b3fc187ecb0ad298c620df056da250fa237a2614d23f2ad11a0b11216d799aabb107f89b89d8e63daa30868bf8829ba358b9586aff
-EBUILD binary-0.5.1.1.ebuild 669 BLAKE2B 584c21e094fd90af48ce71bcd492a242d401dd8ae47ff05afd81dc6067d510d3d95a80c2ef8435d19b70bbf04025cfa6d38e2dd725f24f776179987942d3ff5b SHA512 5c566b0f445b8f49e83b51e61c97629df19d27871213e4f0eacbc2e58796a0f88688074e5aacd8186dfc55aed4425875173bd2acb3fc2dcc8ef3efe59ab764e1
-EBUILD binary-0.7.1.0.ebuild 1115 BLAKE2B 106fb207bedcc730bf3f001460baba509412e8e3d77d1552d6aee408cc3dbbf391b98bcaeadc322ddbf0218b9df87bd15af7815bb460593843502331af9e3c38 SHA512 6363f906630f6bd3b6330c1bfb79409c47264062c87e5f3c86e2ff6b2873d2436fb28e39a257c6dfb3e6091861bbb67f5972348f8b366d6c30b7f4215eab3d23
-EBUILD binary-0.7.2.3.ebuild 850 BLAKE2B fc8bcf797fd20c29383e64b32c98cfbe2c2a949c577051cf9ca634c078c1fffd0073fa6c6dcf4779b4e3b2676d09ce06a1b7ed47b18500cb22fda0b3ecb2265e SHA512 6b479927b4ee3cf8ba718c3f58f648523eaaea8a28fdf9310b38c3ca0c4f2cba737d2e2b46324c5e2c52c36a0df2636efaf62dfb71e7c5f40c308b9455d99629
-EBUILD binary-0.7.5.0.ebuild 860 BLAKE2B 7e1edd2d82bcdf178b61b2526e5da8e6e8bdcad8f13641aacc8ebf477c87c0856ecc9e4fd03a79ded8110b873df37747ec3ac157b5cbc0aa15292959c11baf69 SHA512 71d470a35aa7d299438455937900f8124a997693b52bfdc9c6d9267a20138c305c134ad19ba653bf5308465622b979320e7953c223fb287094c24f3d855fdded
-EBUILD binary-0.7.6.1.ebuild 733 BLAKE2B 48eb96bc231c4e2dad243b02fd748210ebffd1dee7d94b35d966bde7804fec2d569a07a4d8348123006790315d301ccde7bf3d138bec5fa04de6a70c6e78fd1b SHA512 90bb4797268a4bbfb6800ac332124f6c2b0d23b25b9b240f50d6f278119b1f36ea7e22c4e43a77190db0b81e7449127232b57ef06945df3db11a1013ec2f146c
-EBUILD binary-0.8.3.0.ebuild 937 BLAKE2B a766a1284a9208dd34918a85c25a75c750bac5145dba56cc4349269645af52cb522c76912a07da1160aa5b126260d1062820f859a84cf9144c717394e7478916 SHA512 0fda34f172b5dd74a2b67dafa8e76c96fa6343f220f1cb8c746d270935ed9ee55e45be49ba293fc307bcf12fcc318740d4df8dcdc47cc7df74796436c675507b
 EBUILD binary-0.8.7.0.ebuild 1157 BLAKE2B bad4b22ba7fef0efe03e4c82f3b1f115075000ca361c33a9f51df1343c8501e046ddf57595e351dc722af98436d5ed355007b51e0fa42741b4c2081224908a1f SHA512 90be944aaf5d35cd623b04fe0174fcbb3f25caabf59e5ad82da326d598a7b596bf5c90d6b8ea2859b47cc2036b3ba79792f9a442ab099d8bc66e6375498b29ca
 MISC metadata.xml 677 BLAKE2B c28648a0dd6140c8763a604e7976bfc20b9b8174dabb66a63d64df2947ac5ad3d5ceffeb6c60143a88c1328f2b822505e5938161654246c3e33ca0cce4a8e811 SHA512 0b2e3503d82f796a6c3bef7dcaf307de19b3f7d0081690971e0b5f9c9b49451260e87d25e0bd2e311f1249ed111568bb62b246b6a1510b16138c6788aaccb563
diff --git a/dev-haskell/binary/binary-0.5.1.1.ebuild b/dev-haskell/binary/binary-0.5.1.1.ebuild
deleted file mode 100644
index 22de26737827..000000000000
--- a/dev-haskell/binary/binary-0.5.1.1.ebuild
+++ /dev/null
@@ -1,24 +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.2.19.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="http://code.haskell.org/binary/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-CABAL_CORE_LIB_GHC_PV="7.6.* 7.7.*"
diff --git a/dev-haskell/binary/binary-0.7.1.0.ebuild b/dev-haskell/binary/binary-0.7.1.0.ebuild
deleted file mode 100644
index c8203a4b3c40..000000000000
--- a/dev-haskell/binary/binary-0.7.1.0.ebuild
+++ /dev/null
@@ -1,38 +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 test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hunit
-			>=dev-haskell/quickcheck-2.5
-			>=dev-haskell/random-1.0.1.0
-			dev-haskell/test-framework
-			>=dev-haskell/test-framework-quickcheck2-0.3
-		)"
-
-CABAL_CORE_LIB_GHC_PV="7.7.2013* 7.8.20140130 7.8.0.20140228 7.8.1 7.8.2 7.8.3 7.8.4"
-
-src_prepare() {
-	if has_version ">=dev-lang/ghc-7.7"; then
-		sed -e '/test-suite read-write-file/,/ghc-options: -Wall/d' \
-			-i "${S}/${PN}.cabal" \
-			|| die "Could not remove test suite for ghc 7.7"
-	fi
-}
diff --git a/dev-haskell/binary/binary-0.7.2.3.ebuild b/dev-haskell/binary/binary-0.7.2.3.ebuild
deleted file mode 100644
index 42da1f184ba2..000000000000
--- a/dev-haskell/binary/binary-0.7.2.3.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.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.7
-		>=dev-haskell/random-1.0.1.0
-		dev-haskell/test-framework
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
-"
-
-CABAL_CORE_LIB_GHC_PV="7.10.* 7.11.2015*"
diff --git a/dev-haskell/binary/binary-0.7.5.0.ebuild b/dev-haskell/binary/binary-0.7.5.0.ebuild
deleted file mode 100644
index a40297b9f873..000000000000
--- a/dev-haskell/binary/binary-0.7.5.0.ebuild
+++ /dev/null
@@ -1,32 +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="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with latest ghc-7.10
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.8
-		>=dev-haskell/random-1.0.1.0
-		dev-haskell/test-framework
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1"
diff --git a/dev-haskell/binary/binary-0.7.6.1.ebuild b/dev-haskell/binary/binary-0.7.6.1.ebuild
deleted file mode 100644
index f665bde6b618..000000000000
--- a/dev-haskell/binary/binary-0.7.6.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.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Avoid test-suite circular depend
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # binary[test]->test-framework->text->xml->binary
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.10.3_rc1 PM:7.10.3"
diff --git a/dev-haskell/binary/binary-0.8.3.0.ebuild b/dev-haskell/binary/binary-0.8.3.0.ebuild
deleted file mode 100644
index c356ccffd877..000000000000
--- a/dev-haskell/binary/binary-0.8.3.0.ebuild
+++ /dev/null
@@ -1,34 +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 test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.0.1
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # binary[test]->test-framework->text->xml->binary
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.8
-		>=dev-haskell/random-1.0.1.0
-		dev-haskell/test-framework
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.0.1 PM:8.0.2_rc1 PM:8.0.2_rc2 PM:8.0.2 PM:9999"
diff --git a/dev-haskell/biofasta/Manifest b/dev-haskell/biofasta/Manifest
index 883242fb560a..2c5d10a8c2e4 100644
--- a/dev-haskell/biofasta/Manifest
+++ b/dev-haskell/biofasta/Manifest
@@ -1,3 +1,3 @@
 DIST biofasta-0.0.3.tar.gz 14468 BLAKE2B 5df80e3ad74e1c7d5f5cd6538dcdae880829eb7bcef5eb009171e77a24a7705f91a8a7edc24bba1ecbdc73056bd5e9217a6d87cddac43f2bc470c041cddefaa2 SHA512 de50d2f499fc0ee532b5ca28dff868c3dd0d243eaadeb1a4e3a3ebb913812f3308f581aefbf79806d58535b1f78ae283660b5a2348da1a9535f4d48f96b8678e
-EBUILD biofasta-0.0.3.ebuild 598 BLAKE2B df6a728bf54a2a1711a3d231ee7585109056485da9e80dd884e356314fc1bc90b95a5d1809690b230a3079d5522e4572a19d22cea9d5544b36bc747ccbb443a4 SHA512 f22eda8886cbce8210d9613be867322b6013b532ab60034a77f2ab9a54abf7af53225c9e3c7b441dbc72a77321c1c84f2bc81c606453d22f87a45b6e216b2921
+EBUILD biofasta-0.0.3.ebuild 593 BLAKE2B 37273609c49497fdcf5825d70159f44c90f46be2dbef38f2f5043d08f37a17e98a88b2b5d5d9729a904c512d24bb6cf854f03ca0e959a86b0b8a7aafe9da075d SHA512 146663e0512f4922aca43a60dae7c363af9fcf5fe7c8ae8f1ef48b17f27961805d23f835a0bb0c5681fec66191134554382479a7a47a5f5dfa995c228ff02a6d
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/biofasta/biofasta-0.0.3.ebuild b/dev-haskell/biofasta/biofasta-0.0.3.ebuild
index 8621c089a682..1ec7f03607ee 100644
--- a/dev-haskell/biofasta/biofasta-0.0.3.ebuild
+++ b/dev-haskell/biofasta/biofasta-0.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=5
+EAPI=7
 
-# ebuild generated by hackport 0.3.3.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/biocore-0.3.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
+	>=dev-haskell/cabal-1.6
 "
diff --git a/dev-haskell/biosff/Manifest b/dev-haskell/biosff/Manifest
index a0d7fddd53e9..88739a529c4b 100644
--- a/dev-haskell/biosff/Manifest
+++ b/dev-haskell/biosff/Manifest
@@ -1,4 +1,4 @@
 AUX biosff-0.3.7.1-ghc-7.10.patch 214 BLAKE2B aeae844af1b934653223812838a01f6abb3b664d07e6abdf820e37c791b95d8020815744cac094a9ce2e9ce1c1133bf4439b0b903a54de02ec43e7666f87c455 SHA512 44d1f85fb4625114cf1d032a9f16b57a1602489100521e2801bc8aaa42b5bf6990fa3b849fe040f13ff19a13a0cde13ccc3965826d9673a191f4356d8c0cd96f
 DIST biosff-0.3.7.1.tar.gz 26705 BLAKE2B abf585342c14c01a8f202b34ec94e67138e345918b43a52dbf535c3690bca2039c977ee36ebef861d5f215174429f41702e84d440cf52316de0ec82722053f72 SHA512 ce075d734864b9a00999d5c37c824ece5ba475b583536eb842835b4a44ff56581f18ba8ddf065f2ea4416ff4f96279f6a46f5e57330a43d40164f4cabab2ab9f
-EBUILD biosff-0.3.7.1.ebuild 915 BLAKE2B abb6f53fbbd174b51156cbc4af24a0dc6e7bff4ac0893879876fb88ff4ae5728f7f4c44323303faaebe26ee87a1f6129532c5e7c719867bbffcf8699ab73741e SHA512 2478488e63ea0cde7237b8f22c91f86ab0c5bbfb9e8cf6926663a19418ab617e9f06f9c3cad35a941d336043029e3c0c7785fba4318366e374db1db27fd8c43b
-MISC metadata.xml 673 BLAKE2B 4235ed5755c459eaf862037e9f802efb13ffdbc6180bce6747ea6b8e899880549d262596bd8c94bd862667cbf1748c3ed1e47db760e5e9a55c4606c483dd8d19 SHA512 b344429da849558e9e0ae5814111e1fd1add4a4b0548eeb358aaa220ede1ac2dc284378b87ebc8c747c0d8dcbabb05d8d9e00c2bd5b3a2faccdfc7f5c625ff47
+EBUILD biosff-0.3.7.1.ebuild 877 BLAKE2B 6cd441c621cd14f85a71c494ff5d68db23896b6d868aa8785f3c4354d563f70c2c9992551dc8c8205ff3987a3abf7ed52e4ca88418c0c645384c61de03c1cd73 SHA512 985442821c023f2367e1e094b7ba04bb7599bf1f9357d1d9a7b203bab7ea07b3a60cd656cb7c1fb6cbbcc5886d205cf21afa8b0bec6f74a580bc0858a12237e5
+MISC metadata.xml 689 BLAKE2B ca93513fdff1bae2b98185ed4a14a0313aa07f8aed8da548eda82316d2c0331f970bcf5bda8ebf0b6edbc32dd6978fd00289444186f3e14c7f2d8b0b406f5021 SHA512 0c9015c5e1de72fa5f0d0cd7eface35314e566e227751bf73253766f255926afb3f233ab96b6f54e39679081b03a1fff547aaac29b0297d96c6fe17cc27962c6
diff --git a/dev-haskell/biosff/biosff-0.3.7.1.ebuild b/dev-haskell/biosff/biosff-0.3.7.1.ebuild
index 4ca013c51520..a3d46f863ec0 100644
--- a/dev-haskell/biosff/biosff-0.3.7.1.ebuild
+++ b/dev-haskell/biosff/biosff-0.3.7.1.ebuild
@@ -1,11 +1,11 @@
-# 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.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Library and executables for working with SFF files"
@@ -17,19 +17,16 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+fclip +flower +frecover"
 
-RDEPEND="dev-haskell/binary:=[profile?]
-	>=dev-haskell/biocore-0.3:=[profile?]
-	dev-haskell/cmdargs:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
+RDEPEND=">=dev-haskell/biocore-0.3:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
+	flower? ( dev-haskell/cmdargs:=[profile?]
+			>=dev-haskell/mtl-2:=[profile?] )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6
 "
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
+PATCHES=("${FILESDIR}"/${P}-ghc-7.10.patch)
 
 src_configure() {
 	haskell-cabal_src_configure \
diff --git a/dev-haskell/biosff/metadata.xml b/dev-haskell/biosff/metadata.xml
index d5fd876231a8..d11b6ace7fc6 100644
--- a/dev-haskell/biosff/metadata.xml
+++ b/dev-haskell/biosff/metadata.xml
@@ -5,14 +5,14 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<use>
+		<flag name="fclip">Build the 'fclip' executable.</flag>
+		<flag name="flower">Build the 'flower' executable.</flag>
+		<flag name="frecover">Build the 'frecover' executable.</flag>
+	</use>
 	<longdescription>
 		The library contains the functionality for reading and writing
 		SFF files (sequencing data from 454 and Ion Torrent).  It duplicates
-		code from (and is incompatible with) the "bio" library.
+		code from (and is incompatible with) the &quot;bio&quot; library.
 	</longdescription>
-	<use>
-		<flag name="fclip">Build the fclip executable.</flag>
-		<flag name="flower">Build the flower executable.</flag>
-		<flag name="frecover">Build the frecover executable.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-haskell/bits-atomic/Manifest b/dev-haskell/bits-atomic/Manifest
index 106244b2176d..256afe1c9662 100644
--- a/dev-haskell/bits-atomic/Manifest
+++ b/dev-haskell/bits-atomic/Manifest
@@ -1,5 +1,5 @@
 AUX bits-atomic-0.1.3-ghc-8.patch 353 BLAKE2B 14eaaac0e86a1be6911512bd6e77ee8124fa8aea14ac4af5aa4281e9b0b8b94e015e387cd5f6a50a21c6fa1917dffe20af57deaa8781381ec5f92293b1fbba0a SHA512 a33787a086dd72120b50d0fd78b80435e5c62f54daaadfc21177973119a75f0b0855311c655c0656aab8ad9712c34e8d60e4f371f2be244b283aee9f53c3aab2
 DIST bits-atomic-0.1.3-gcc-5.patch 30907 BLAKE2B 135d495f914af645de82c4d3cd491460dba6fee5293a591f9e83ad07efd7b47cedf32a841557eca0a852690e9367c6fd7a0d6722d6212193c7188fe70d673d77 SHA512 0a40015f225325db3716ac0a17e33eef3f2042b72f933000a52734b103ea3e316a0242a0b75c90a31d0d4c31d33da8d32b07f7c067d79ade51df66ea75a3b19c
 DIST bits-atomic-0.1.3.tar.gz 7982 BLAKE2B 4ac1e6c808c30fb8ad59509aefb9dcb32f98023b31efb2eabf59ea94cbc681aa94219a8389179c7755dfb8ad944bcab122676aca361502d030c85d04c7a4f113 SHA512 e13c21c81ebc6cce2f85a184a572eb1647439f605985a8344ff219cc685c7d0adcf5d2433ea75fa1560a807e329cab23b548435adc0087e6294417eb7a65fbf1
-EBUILD bits-atomic-0.1.3-r1.ebuild 905 BLAKE2B db2b746a3997b6b4f7bcb7be036b0d1942818fb22b0dbdf36648cfa4887a83732803df14f2229bd858118c7a5f32020b5ba360e17b91d1c67d3629aed50f971b SHA512 8c6f01f175fc6bfb4e37b2525f7f2f2fd148cd986ef6d80df82642466878d9880bb597fbea00f33929ccd912cb7f4156efceb1367b60a7650a1b1df49b505fe5
+EBUILD bits-atomic-0.1.3-r1.ebuild 885 BLAKE2B 866cb20ac442ebcb0403907ee7baa6b8d6c422d705eec5c00fb88315f8455c2590836e015c47a1e77b106f74b055f09a7431c51cb03f789ab5ce149843893a8e SHA512 bba66b5a1d8b167130e2b5b4f37dab15bb7a1b7e1b636da15341495fb11569abe4c9b147d15064e058e3fdca19c46855d8223cd0391ea726d6dd5d03d135f786
 MISC metadata.xml 1690 BLAKE2B 5e7ba5e0a6d3fa70320bebfae9b569a59eef36c2ba6c50cd9fdb45819b1e5de7c0212d00ff2dff1348bca081df414a7f628e59c23db10d286349787c025d878f SHA512 c96b9f74ab1f7e63f8595771535b9f6b020c5d355acc1875275839f07ff7a5141e8be09f8278aa49b10f291c945832ca4ef81a71f385ae71b2f664d1116f80e1
diff --git a/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild b/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild
index 11024cb68c50..278b011fad91 100644
--- a/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild
+++ b/dev-haskell/bits-atomic/bits-atomic-0.1.3-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=7
 
 # ebuild generated by hackport 0.4.6.9999
 
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 		dev-haskell/test-framework-quickcheck2 )
 "
 
-src_prepare() {
-	epatch "${DISTDIR}"/${P}-gcc-5.patch
-	epatch "${FILESDIR}"/${P}-ghc-8.patch
-}
+PATCHES=(
+	"${DISTDIR}"/${P}-gcc-5.patch
+	"${FILESDIR}"/${P}-ghc-8.patch
+)
diff --git a/dev-haskell/blaze-builder-conduit/Manifest b/dev-haskell/blaze-builder-conduit/Manifest
index 0f750a571807..31cc72c9919c 100644
--- a/dev-haskell/blaze-builder-conduit/Manifest
+++ b/dev-haskell/blaze-builder-conduit/Manifest
@@ -1,3 +1,3 @@
 DIST blaze-builder-conduit-1.1.0.tar.gz 1367 BLAKE2B f62b2a5d8dcabec2d9173eb2cdd0569821735624bc8dd9c14779f9a3e2a2c6222d9c95666daac3884aa2edb8b1f2324a8e097d513e48f8479761597d4be570ab SHA512 99a558801dd0bfec495648dc1a964ddf7a53d363c82ddde794bb98b6c3d12ca74edc7d79257cbf83d8802d0197c75c9e71e637de32e30b76600ce9475b0ad797
-EBUILD blaze-builder-conduit-1.1.0.ebuild 582 BLAKE2B f7106ad5d59272be5f6b356931e57119672906e04dd8ea1d7b57ce0c2c4d81d56324c2bf93e93099de2530470c11bfbd6ef0dc8692018114cf62875cbff40766 SHA512 c61b637501e098014715d8e14fba99d0cb1b58d6b6e05d753ca93c18b615fdc8d5778c38738204189c3a9968e560c6bfa9dcd64ed9be553eb4ea97c7952f6703
+EBUILD blaze-builder-conduit-1.1.0.ebuild 605 BLAKE2B 124f69f96058ea39335bb86e2e32348217f3e24a750897c26cbcfdc00a12d7ed83a998f7c07390fe6aa9f24ae954b735e63113802f60598597c3eb9870d68fdc SHA512 0696742dd500938849abaceb1fb9fab5224573cbeb5651712a2108dd7788b1955e7835ace3fd37d68811e2240117cf6a1e16f635e4ef1ab3f0e9fd423e549089
 MISC metadata.xml 330 BLAKE2B d56163baf6c38494b371fd7f1fcd301119899051db4735a607f802ec25550dcdac277005a9785b323311bd0e4282630ea8de2abff756b5fc1067ef4d07d6de51 SHA512 48095eabcee345441e214e87e05b66a2323a48ccf2f596601105375f3f36d30dfe5c193e717858ff4f4719e49bdb9e5c3bf85c52cd87cb039e35c2208db3417e
diff --git a/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild b/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild
index cf4d2a9afeeb..4efad85f8a29 100644
--- a/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild
+++ b/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild
@@ -1,11 +1,11 @@
-# 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.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="lib profile"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Convert streams of builders to streams of bytestrings. (deprecated)"
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/blaze-textual/Manifest b/dev-haskell/blaze-textual/Manifest
index 798f6cb2de05..d956dc3ed656 100644
--- a/dev-haskell/blaze-textual/Manifest
+++ b/dev-haskell/blaze-textual/Manifest
@@ -1,3 +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
+EBUILD blaze-textual-0.2.1.0.ebuild 1043 BLAKE2B 431bf636a639c3a970f94ada2d1ed9db98586d092d3ea8915ab5af9025e115748e2b22dd2a3282843c9ab91fbdc01d0b8c0cafb4f3db151ca6b78e56536c7ce5 SHA512 aac8e1f367162936066d43c54bed0c56fa41e8cf40ebbdd3c3b49201a64e62799081d9984cfe599789bdcc1f342da829a736146bba3056a4679e23068890a1e0
 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
index b83befa93abe..d4950a1b2dc7 100644
--- a/dev-haskell/blaze-textual/blaze-textual-0.2.1.0.ebuild
+++ b/dev-haskell/blaze-textual/blaze-textual-0.2.1.0.ebuild
@@ -1,9 +1,9 @@
 # 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.6.9999
 #hackport: flags: -developer,-native
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
diff --git a/dev-haskell/bloomfilter/Manifest b/dev-haskell/bloomfilter/Manifest
index d89d11d324c3..61b8393da89f 100644
--- a/dev-haskell/bloomfilter/Manifest
+++ b/dev-haskell/bloomfilter/Manifest
@@ -1,3 +1,3 @@
 DIST bloomfilter-2.0.1.0.tar.gz 22100 BLAKE2B c00a904a32c2e16810b19e27d7adef365ecf48b62bcd8da871aa3b33cb9b6e18cb11771da5a7df7209ce048e2fa1176b9c3f015030d0349a10a32375f462df02 SHA512 1031cc28c5e5c1b7687355b709d436ebab1956ffd7591a010fa3852a1bc7412925a365f99937feeacf4b1a5d3c7b34bc0370707ad6e4533280dcac4ea3fa7c21
-EBUILD bloomfilter-2.0.1.0.ebuild 697 BLAKE2B dec073878eb3ba72b8f1ab5498b9db138745b430d2cd71899e9b60b15fa10ebb4bd94142b789351bd16320297501e812e1e939a4d4c263ac9440ac2ab9d6ef06 SHA512 da883dbd7b1cfe6d818437fbcee26e2b27377f46cb73523cfe51e4bb94943d46af636ed6055d44fa2305a9195014ce6900c4446c6ee4415866133b4138e37e4c
+EBUILD bloomfilter-2.0.1.0.ebuild 697 BLAKE2B cab813121d2b9220017fd33c968bb34a53d93f1134147d266d9c93d36b99fdfe2eaa009545c9dc2b7d8acb67ddee5f19e1050221656744ee8e28c153a754a33f SHA512 a3afe03b5a0700e38f8443cfba3624756704805371fcd8af1b1798f8eed4a360e07e68997dfd96dbd7e78675e2fd32e404c195959e59eea09e2a8ea95539e479
 MISC metadata.xml 329 BLAKE2B d5eb21fb32e89511bdfabdf35d0abf4e32e5b367e0ae343c87a73ca63ac0fe0087711f0fb326d7ad3015a53eb062360086ab38c0fc2564e4c95177a463490e32 SHA512 2a2bbb1db482577ca69d93188c94cc109990d3e62c5cd56c4478b12d60c6ec02e93845594d4862440b52ceb37faf6230cbbb4767dd073f6c3f1f594babd1a517
diff --git a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
index 341f5c9445dd..746d11fb076a 100644
--- a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
+++ b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.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.5.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/boundedchan/Manifest b/dev-haskell/boundedchan/Manifest
index 17f31d28f084..b17a94441713 100644
--- a/dev-haskell/boundedchan/Manifest
+++ b/dev-haskell/boundedchan/Manifest
@@ -1,3 +1,3 @@
 DIST BoundedChan-1.0.3.0.tar.gz 3591 BLAKE2B df6f085ea129efccec006dec7133524fc88332fb6451f8ee63702b985e6481c5741aecc0974c203f43b25f63036dbf0935e44e4a9cabf3f1c3574be9580bdf26 SHA512 4d842d2b499dce265329f81a402fbda2e97e00b7e04d55176225f6a1284d5dafae4712df1ab71effd328e65f218c582440d4db3e62e253033da49339cbfb7055
-EBUILD boundedchan-1.0.3.0.ebuild 616 BLAKE2B a0f24b53afbd0bb1ba7bb692bd80194295c52be33ad01dbaa0688116e67f7cd160c16ebc55eac17929b88d618195fbc179a7b3c729d5a17b98f3e0e5312941ac SHA512 6c0e1960b38691719e0e1e35b6fd25eb069ee0eef739c61dd13a190e90733d1f4cc8c8529a567ee820208cbc02817ead538dd0f698ffa6c7f376d2b3a78d6ffb
-MISC metadata.xml 444 BLAKE2B 7ac8ff997977eca7391b982a47f0c6af68a2c94cfc92d9c0aed80bb2818c6d6a1ec63185539f134bdd0e3b4ea8f60e9f0edb2ed7358a258eae6b216f2bfecc00 SHA512 aeda6f3ee8572a41e1a410131e9956002419d3cfb1b39a78919f34bb503f935b2baf5d8748ffe0db563ba68f04d2bf5fc381f5ced280115017a74a2a36d9c5c9
+EBUILD boundedchan-1.0.3.0.ebuild 618 BLAKE2B c676701049ca9a2337da114a46bd2019963ac10fd6f793f401a888c3cf801db7e185ba0d258dc87470f84e8ab1cb2108147b519bdc778fe8ca7336a4cd634ef4 SHA512 7b4cee76e3874403b152fa8b99177d6bf2311fdbc267c441c68d9db0a56b2a2177897ee8d814b35a7d275f725b11b97ca28dd686ec85472e87c9b60c9b12931d
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/boundedchan/boundedchan-1.0.3.0.ebuild b/dev-haskell/boundedchan/boundedchan-1.0.3.0.ebuild
index 39d6d2de3f04..1a257e5e28f5 100644
--- a/dev-haskell/boundedchan/boundedchan-1.0.3.0.ebuild
+++ b/dev-haskell/boundedchan/boundedchan-1.0.3.0.ebuild
@@ -1,9 +1,9 @@
 # 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.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/boundedchan/metadata.xml b/dev-haskell/boundedchan/metadata.xml
index 44ffdbacb027..b7878815d80d 100644
--- a/dev-haskell/boundedchan/metadata.xml
+++ b/dev-haskell/boundedchan/metadata.xml
@@ -5,9 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library introduces BoundedChan. BoundedChans differ from
-		Chans in that they are guaranteed to contain no more than a
-		certain number of elements.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/byteable/Manifest b/dev-haskell/byteable/Manifest
index 13910992b3f4..ce3446e0c96d 100644
--- a/dev-haskell/byteable/Manifest
+++ b/dev-haskell/byteable/Manifest
@@ -1,3 +1,3 @@
 DIST byteable-0.1.1.tar.gz 2400 BLAKE2B 0da53566faeb934ffb63623dbc58f6f3b2e4499f6a5547ff6707b034e8e5ea097c4dea600d83421f7da47958cc54c0377d4f53e123480aba464ab5fcfe7780bb SHA512 f2e6225390be9f35ee6a4ce981aaa8c2683f1627a8401386b1abb7fff5fe1474ae0fa07e71a0c83694d7a18ca793943fe36b844d868c3e9c3387ce1a7b2bf54c
-EBUILD byteable-0.1.1.ebuild 560 BLAKE2B 826f3339f6c7c26e94b50f0ba3f6dd3b1e87c0f08f9fa4963227076adcf961c124c14dd21ef310900f4f95bd484366ea524005d647b5321fb0fd00bebfeb914f SHA512 f358b8c6bd7ec53bf84d46977e307c3322892e9d91a4c52a2a0a661f6e33456dd270abb7dab355b4f468f73a898e10dc145f925188fc9b488fb86c02579f0a51
-MISC metadata.xml 643 BLAKE2B 0b7d1cdcd4ab0cbf6bb5188d998fd2f41ced93612c8040e1ef21a00223a3fc165593de53ac413baf9bcc31dcb5dfc4146fda3c41c93d4ed70177e175dff26828 SHA512 e13e4ca680397e42cc6b852af77fb8d48f55238bc9c5ff58469f3ae8815b3b2db8cf9055cc42c2f8f965e699301ee39dfce56b2fb9859a8aa06f64225bd4f0da
+EBUILD byteable-0.1.1.ebuild 560 BLAKE2B 3c3348649255a7d630e090951d577c3debede0b82881c9a74f456ebd9f47252805690c38410e7ee614003a3bb1a0f1bda38f76dd8faa407e54835c69848ea24b SHA512 4577cfbd94a20cebe618eac5ce84422819c4553bd4a47cd6ea28a64120fda2eb223aa8892dd76babf5bcfc1147b695992e440f1acc847d4e4167b0e410bc4ffa
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/byteable/byteable-0.1.1.ebuild b/dev-haskell/byteable/byteable-0.1.1.ebuild
index 96b40f8d68f1..baf7a77b5f27 100644
--- a/dev-haskell/byteable/byteable-0.1.1.ebuild
+++ b/dev-haskell/byteable/byteable-0.1.1.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.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,6 +17,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
+	>=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/byteable/metadata.xml b/dev-haskell/byteable/metadata.xml
index 6b0f50e8e8e8..b7878815d80d 100644
--- a/dev-haskell/byteable/metadata.xml
+++ b/dev-haskell/byteable/metadata.xml
@@ -5,16 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Abstract class to manipulate sequence of bytes
-		
-		The use case of this class is abstracting manipulation of
-		types that are just wrapping a bytestring with stronger and
-		more meaniful name.
-		
-		Usual definition is of the form: newtype MyType = MyType ByteString
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-byteable</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/byteorder/Manifest b/dev-haskell/byteorder/Manifest
index 54d881d35016..3d9c6e0bb21b 100644
--- a/dev-haskell/byteorder/Manifest
+++ b/dev-haskell/byteorder/Manifest
@@ -1,3 +1,3 @@
 DIST byteorder-1.0.4.tar.gz 2030 BLAKE2B fbdf38993b9e4898a72592ef58579857082d8671460de97f6c458a7b953bbcb4958e62c4e726eff4744beb39def4042a000e9b5d88a3ccfcd6de7662cab32992 SHA512 970f74a394947b023ab88fa7bc713478b50565e3e9535479ec641283f18e04cb952788334b2ab38fafe723f2d398b1626af92f349abc11a6c6ca5a6974653025
-EBUILD byteorder-1.0.4.ebuild 577 BLAKE2B 1a60146584dce329f6e08548909346a8cf6319d45098ff6e45797fb9d83f67cce0c0b03695c1610f9a645104a4b438a180337f12c12d8249eccad76710f43798 SHA512 482818c0f1a9468a59e6bb606d87310bb3aeedb75727a39ca455cef259f8da96fba21b181d00c6972d7387cb7c55d72735a3cd028256985f84be5e420fe900d9
+EBUILD byteorder-1.0.4.ebuild 577 BLAKE2B f5cc301f7e1c4021de0a64792d2f5df406699d49404b253cafbae3902304eed58d08d6b9465df8e2fe26086bcff6dde783201d237ea299353b1a19f44621c578 SHA512 e14150f96ba5a89f0acea5fe731f01640f22b0cf8fb0bebf3b43005fd2932aa6df6f8b87ab5fe9a0e635d96ce499c7f8bd7ca16f571a15057f232df2cbe24059
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/byteorder/byteorder-1.0.4.ebuild b/dev-haskell/byteorder/byteorder-1.0.4.ebuild
index e54facf0fe9b..fae9f941b8f1 100644
--- a/dev-haskell/byteorder/byteorder-1.0.4.ebuild
+++ b/dev-haskell/byteorder/byteorder-1.0.4.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.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,6 +17,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/bytestring-mmap/Manifest b/dev-haskell/bytestring-mmap/Manifest
index 3eb917bdab3a..4301a2e184ad 100644
--- a/dev-haskell/bytestring-mmap/Manifest
+++ b/dev-haskell/bytestring-mmap/Manifest
@@ -1,3 +1,3 @@
 DIST bytestring-mmap-0.2.2.tar.gz 7188 BLAKE2B d699e51f8f2416e30013dcf87fcfaa4d0ef129c1ca9951c320a7312a1ce73db14addedf47fc138b485197a4cfb115378a4544428ad974c70d89d7b3b467ace22 SHA512 0cde0bb36808d7086f6b3e3e94813c205a61ec1d0b2156a7fac98c1dc520dcdd1821a7873b7ecb9a77fdcd254b5ac1077da86865ade20a49bba0e0da1befcf46
-EBUILD bytestring-mmap-0.2.2-r1.ebuild 555 BLAKE2B 4cd24170d4036201e57540a567ff343d01fc850417d2a1745817300c107b11d0bfaf905ee6e805217f4663fa09cd8e54fe271e7b3377c1d6b90ee891a2c7a5f2 SHA512 fe1cfc1861418b4764e7b2ec6a73e9e9cdc26e79764739e9cd7a6ae06144ceb3594f917a40bfe61f3da53ed838051a8c506b6751b8341069a18297990d1ee403
-MISC metadata.xml 495 BLAKE2B 702d8a8fd8ecdc932de1540dfe740662957c2fa256fa230a129deb7226cfdd214a6edce80df1facd734531206a9c0dfbef3d5e4bb1662b570e93dd2dad4b0f33 SHA512 23cd61a8ebba8b77e92e29c4bbfe7279ea13131d151f1672d105de2239bf0cefb4f8ecd4c6500054c522deb3e5b39b04ebc4918463a4e4bdddca4d0eaa9d9a82
+EBUILD bytestring-mmap-0.2.2-r1.ebuild 550 BLAKE2B 69720368ab46c341c609597cd3132765490f25948a9175274caabaa43dca0c230470a42bfb5936197970d5a1d3c2c690af3cb47c41ab0ae91a78bc0b2cdeb532 SHA512 293c65538eb143c4cf785e0729b2070a2be8e3c379a5c2bb7b485683616b4c54b26a21bb7b4aeed1174c99aa9be0f4639f9a6834ba01581d1ab87f12857e026d
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild b/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild
index 5a263f0f5147..1edb2c934332 100644
--- a/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild
+++ b/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.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.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,8 +17,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:=
+RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
+	>=dev-haskell/cabal-1.2
 "
diff --git a/dev-haskell/bytestring-mmap/metadata.xml b/dev-haskell/bytestring-mmap/metadata.xml
index 2e6580f28d8a..b7878815d80d 100644
--- a/dev-haskell/bytestring-mmap/metadata.xml
+++ b/dev-haskell/bytestring-mmap/metadata.xml
@@ -5,12 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		
-		This library provides a wrapper to mmap(2), allowing files or
-		devices to be lazily loaded into memory as strict or lazy
-		ByteStrings, using the virtual memory subsystem to do on-demand
-		loading.
-		
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 037626c63a7b..b4efa6597bb1 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -9,10 +9,10 @@ DIST Cabal-2.0.0.2.tar.gz 1551128 BLAKE2B bc053a31ddd966577b1c4d5b80bd778fe0b5aa
 DIST Cabal-2.4.0.1.tar.gz 4801392 BLAKE2B 489096b7297e217866006f02e7ef41fe362d6495f81ebbb3b3149341bf9ff18d93d102fe836259471ed9ec1c6c591f5564f81a623a7e4106b9e8a4388646d73f SHA512 4b2a1187e1ec011052ab77ef4bc700608eaab3e921554dd9d75bfca058c487a5651ab6cfe2734ee6cc9687d504a008b4912db182166f0f2f52d23fc08230e48c
 DIST Cabal-3.0.1.0.tar.gz 758808 BLAKE2B 9a0cf7b055be4d6fa55c4dd44037263df54eff059cd22970383ffa1470317cdaeac8d81a521f8c48cf595fc22e64da031d508f6d2b58f32a613160b3e0cfcd67 SHA512 29a5ae9bad0398ab86c64cba9fb1ae3094d67013151a91c8c25b0e95b08d8fd683d1e85b064f7faf166966f855b261d2f131b727c82476a8514119a8922a6b06
 EBUILD cabal-1.18.1.2.ebuild 1268 BLAKE2B b014fead9752c3365d881f73dc489dfdf0e9ed955a59b60369778cbce07e773da9de24bc97c8e9af3cd3df7a29fe42170666ccda5f7b979d7edc8616e29d5bf2 SHA512 c1fbb3916ee873782112257f117bb8d4d1de19fc97c4ad9b2d75bdf6dd075954d0d6b58f35f84d2abe40cd9564e3a4eb1f07a2a3665e62581d770c5b252a8e2c
-EBUILD cabal-1.18.1.3.ebuild 1440 BLAKE2B f1e4c8627c60c4681ac1bc33b9cf0a38ba71012b1324dd7c35838adac0c066b5f63183f165fc7a60b5f3abf508475cbef1aca13fb38264534ee095d63438bd7b SHA512 f91023a353b58445445c152df3516fdbfe676f4be192e6cf7c1358549272fd2520a6702bde8f8f5cccb5633b495a6320c0d50f7403a652ee0a84c731741acccc
-EBUILD cabal-1.18.1.5.ebuild 1462 BLAKE2B 09537d9c72d9a6a96c5d3f15ff428d2230c6fe2dd308c777d957c3bc1c597cf895f27961e7bb6e0cc79e18a445c65394771fb0fb52fb432b228f978474bf3933 SHA512 09b83a7d8fe8d2c265f6c4d1f78bc01e261710387c3fa084108e1bf10ea54f8ed62c522e8d72228c259f7c2c390d4bca1e60f535cfe3b040bb8bfcfb77172a59
-EBUILD cabal-1.20.0.2.ebuild 1517 BLAKE2B 2db8326a9cbd2f7c81817f81df63eb4b2fe94660ecb4051cf4910ed8d7ebee48a93615964f7f8486fe5f46039d79a2780837d53d629e0011aa2b84c1c7fdc4ea SHA512 d86d606cd92e62e0d79c5e1ac6474d0e3b685463b762d8f1ca746481568aff05caf49e02edcd74c99f0eb5974d497c79fe77bc9e5bfb4b374a739211ad9c8d32
-EBUILD cabal-1.22.8.0.ebuild 1406 BLAKE2B ca1f5fffd1544682816fb0b31543ffe431d82004599309dae49f5c9e556b6b157eb7622a06c3e2d2a9437ebbdef7431355da549641d8994888b61b7081b6cf19 SHA512 2ec1cc5c33c016542a320f9962c144f41ea077bc983bf3964ab42baca0f2a585fa4e71dd655c01d05e77d7d7678948dd44dcc46440f11c87f1b94309bedee490
+EBUILD cabal-1.18.1.3.ebuild 1450 BLAKE2B 6c963bbcbe33384457c397109770e8b3abf1d879a6ca2d235edcb4052b70c8d486463ef7aba8746882b794ec85c5397a34c86d650cd8d46e0c17a6085acfa7e8 SHA512 b949337d9519810a5b397a541d1bf56f4c50e7da58f797ddb1168c7afc64fb71e78d0239013cae988a10e9ea70f91565ab54fe76b1b89d9c6f735982c677739d
+EBUILD cabal-1.18.1.5.ebuild 1472 BLAKE2B 675f2fd26f23db0fb15e58642831e211157d07715fcbad7d0f5fa64857f52ac8afb6507cbf27556fb6d4e83efcfb5c24159f75e3048c88815c85ce64e466d177 SHA512 a372399466280f6de971744585bba9c926c4a12a46eb66854c611be9a28a47786505e8e8dad1f4e3ad2947353a1c4de133966c600877cbf403a0a535dd555853
+EBUILD cabal-1.20.0.2.ebuild 1527 BLAKE2B aa98d8abd5d11bfc8f868022445ae8a3cfdc2daea9e7b02c7f1555b0dc17f4af02d6da79c7f8116f350db1a4bf1d770d8851f9574ce0129a625107729e98eb3c SHA512 ad6991da56977b9b74ecbd23d9141414c4d32db593c9c334a82aea309587185030912061cdf96e4e5028cbf4fa409bcd505064b6d634b84d6f88a25a57d47590
+EBUILD cabal-1.22.8.0.ebuild 1416 BLAKE2B 72f8209e6989e276b5a47c75e56237ce01299e8e4636b71075d200fdac3d46b1146fba0e94f8493134d619dea80f54a51e311ddfe7da55e079b0d307b6943c2d SHA512 42365363c1a3507a77a779547be97a5fe7a8c760ab2453c35f35b0577d5467095a43293a123b0328f88b487ec3d26c91d9cb9dc9c1bd54d75c697028fb972acb
 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 1244 BLAKE2B c49bdc329ee67863a9f67c0c2f47232cbec726194a00b4a61688cdc19099f239a3902dbe94834257ea0285835b4b85f1de69933ea1d8ce14b52ca08b36e82006 SHA512 4f52e44cab2d5654d3134692cd1ee5387e1aff48c95291be0258faed089848fff3e291d8859ce01d402a7e8d2fec3434c422f8288aee5e687f03a3a0801ce18b
diff --git a/dev-haskell/cabal/cabal-1.18.1.3.ebuild b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
index b4a410cf4d32..c48c74d40c4f 100644
--- a/dev-haskell/cabal/cabal-1.18.1.3.ebuild
+++ b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
@@ -1,7 +1,7 @@
 # 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.3.6.9999
 
@@ -37,6 +37,8 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 CABAL_CORE_LIB_GHC_PV="7.8.2014* 7.8.0.2014* 7.8.1 7.8.2 7.8.3 7.8.3.20141119"
 
 src_prepare() {
+	default
+
 	if [[ -n ${LIVE_EBUILD} ]]; then
 		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
 	fi
diff --git a/dev-haskell/cabal/cabal-1.18.1.5.ebuild b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
index 369324fa4712..220ee8187a53 100644
--- a/dev-haskell/cabal/cabal-1.18.1.5.ebuild
+++ b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
@@ -1,7 +1,7 @@
 # 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.3.6.9999
 
@@ -39,6 +39,8 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 CABAL_CORE_LIB_GHC_PV="7.8.4"
 
 src_prepare() {
+	default
+
 	if [[ -n ${LIVE_EBUILD} ]]; then
 		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
 	fi
diff --git a/dev-haskell/cabal/cabal-1.20.0.2.ebuild b/dev-haskell/cabal/cabal-1.20.0.2.ebuild
index abbfa9df88f6..de5558e4a3a9 100644
--- a/dev-haskell/cabal/cabal-1.20.0.2.ebuild
+++ b/dev-haskell/cabal/cabal-1.20.0.2.ebuild
@@ -1,7 +1,7 @@
 # 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.9999
 
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_prepare() {
+	default
+
 	if [[ -n ${LIVE_EBUILD} ]]; then
 		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
 	fi
diff --git a/dev-haskell/cabal/cabal-1.22.8.0.ebuild b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
index c42d09e543c7..15fd12acb3a9 100644
--- a/dev-haskell/cabal/cabal-1.22.8.0.ebuild
+++ b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
@@ -1,7 +1,7 @@
 # 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
 
@@ -37,6 +37,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_prepare() {
+	default
+
 	if [[ -n ${LIVE_EBUILD} ]]; then
 		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
 	fi
diff --git a/dev-haskell/cipher-aes/Manifest b/dev-haskell/cipher-aes/Manifest
index 86a5487edf61..63ae1d9cea3c 100644
--- a/dev-haskell/cipher-aes/Manifest
+++ b/dev-haskell/cipher-aes/Manifest
@@ -1,3 +1,3 @@
 DIST cipher-aes-0.2.11.tar.gz 33939 BLAKE2B 98f065baeea41684fe3a59366dba70ffac2f7539710e67648952820e38affb12588b471070def1b4f2bc0c9a6f9ad1155bd22c6182db384cc0349ddb8945a854 SHA512 d0c9b94e93903d0a3ea5587a4ac4ee5124b5189842070dd11c99182ba7396c982aa8c3eae2f8a1fd5b906f8ab3306e4b49ae9276a837e871278d6fe591bbd816
-EBUILD cipher-aes-0.2.11.ebuild 1194 BLAKE2B 13960c3dc47b24d78778effd04ad165adb43a8cd1a74e641ec1e3bdd073d497878ca3f8aa0914588431cf6d0611929571af71ef562adb10ab6d42925e54e6c5d SHA512 2e8a7299905dbe1faaedcca1c7b3dc6f07f7cea451af2d182af701ef0823c8b8cdff2af8c5b09fadf91345902d8808e8153d55a92055168862f535eea8449bd7
+EBUILD cipher-aes-0.2.11.ebuild 1194 BLAKE2B 4616906639ce581125854f4b803be18240002704fc6bf9c79dc1eca97cdb98899a0aa5f05ed28c481cffc483398deb30ac7a4faeca1a1477d8235fc4d506724f SHA512 9b2d32a913ed3036b7933367afa431258fdc26d608f69ad97067ba675a0981b636db9d274cac8a4798c1b399c693d5faf2ba1237beb0a88b7e71a9a73241ef8d
 MISC metadata.xml 337 BLAKE2B 8ec0c92f98e094316de3446627d52d140ba3282f716ef8971fe00684e9eefd48d380296a5a33392d692a1b7f94e5391bcb1d9f5af864cc2faeda83589e24b347 SHA512 9db436e01eeaeb93e33a581fbd4e73155dcd3d6845564eb38df08007d92169a0f82d19f92cb9bf0141bdbabb963947ebe710a1a867e79ef56501df1d55bb67f0
diff --git a/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild b/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild
index 24980eb9266e..a529161857d7 100644
--- a/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild
+++ b/dev-haskell/cipher-aes/cipher-aes-0.2.11.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.5.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: support_aesni:cpu_flags_x86_aes
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
diff --git a/dev-haskell/cipher-camellia/Manifest b/dev-haskell/cipher-camellia/Manifest
index f8769c1e93f1..ebcaa139f5a0 100644
--- a/dev-haskell/cipher-camellia/Manifest
+++ b/dev-haskell/cipher-camellia/Manifest
@@ -1,3 +1,3 @@
 DIST cipher-camellia-0.0.2.tar.gz 6230 BLAKE2B d40fc1cc549d6150a10154fc68e134dbad0c451a60632be081e94c95b75053ff64a26ffca7fc899b3df88294341b4a9f209e10ac91f39de368dd3466cf017717 SHA512 d3094d2b190023b6afbab20f7d1c01826f56b7c99ea0c9613fcb14c8d3f3f3c3e16b57c2643a9df2bcf12cc97596cd32dd717fedf81fd84a9cdb9f46f308e130
-EBUILD cipher-camellia-0.0.2.ebuild 922 BLAKE2B b5bc7157177f4ee5fba5fc78605b41c8170086ebb6027f64d4a768ac947a4a0808cd667a9a8e1a45b9a98c03d6d0eac56e9a616348de6ade6cf39656714b60ac SHA512 d96710c49dc2d9e871847c9b05dbbeb18598afa111058522c55324c8fce22674c4bd41cda050a2f8fd8f996b982e5cdfc1bb1a195bf459ad34d067bd96408886
+EBUILD cipher-camellia-0.0.2.ebuild 921 BLAKE2B d7e32452b4f328d3733e66f1bfeef6d5dbe2da2ffa5028f1fa89821ca5b3f46a3e9ca555b92192b2766bd581f3b6bfc49e7dd40afde2c6978f6caf56effd6abd SHA512 eeb437c6fe93ddda6001224a2530da7f04b7582406d572f1883e574f382b35569a791ee92040471f00acf63a050a4d43e324cc4f6775de028a5ef10e07d13644
 MISC metadata.xml 340 BLAKE2B fa7ffd27bb988c64b885de8879661929121e2833c146b373a23c2d649e58379dfcfd182fdc90d20116f4ab31251b379f0310a84040aa0bf6d7209ce9388a7873 SHA512 88ce6598988d5ac898de9b179e55518b3e68ffa9095a9ae194ea058340544c4d9f3ad9bd3f36d5ea8c50c3a52664140756ce19d91b06ec994fcf8d326ade85a4
diff --git a/dev-haskell/cipher-camellia/cipher-camellia-0.0.2.ebuild b/dev-haskell/cipher-camellia/cipher-camellia-0.0.2.ebuild
index 93acb1fa79c1..35bab2342d0a 100644
--- a/dev-haskell/cipher-camellia/cipher-camellia-0.0.2.ebuild
+++ b/dev-haskell/cipher-camellia/cipher-camellia-0.0.2.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.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -21,7 +21,7 @@ RDEPEND="dev-haskell/byteable:=[profile?]
 	>=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
 	>=dev-haskell/securemem-0.1.2:=[profile?]
 	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/cipher-des/Manifest b/dev-haskell/cipher-des/Manifest
index cc37037ccd39..1227ca6353c1 100644
--- a/dev-haskell/cipher-des/Manifest
+++ b/dev-haskell/cipher-des/Manifest
@@ -1,3 +1,3 @@
 DIST cipher-des-0.0.6.tar.gz 7857 BLAKE2B 333c629ba2e4c9ca80d3caf29400e805abd774a23f9823fbededc74e3997602702b78066034e24d32313a42e7409d430835f918e1c8c5baf62ef404fe9792f91 SHA512 290b72fb9d6da58450e43742b313ff295cf3bf88242de33069e3183df7f726b69174dae35572a3d7d3a356aef4d4067104c41c1bd06fead8fec227ff92ba10c9
-EBUILD cipher-des-0.0.6.ebuild 881 BLAKE2B 7fcbf1beee4a31e7aaf2c0440bc903418e54dbeb9284ada7cfc93b641f044dd036a476b669d2e1ac33d435f7b179186055c35afe302d3b25e23aa9f63dfaa5ea SHA512 c9df43a95064af4e57ffaccfe34b6731a08e07cb9537b81bf66e8078f7bdc07dbb84ba87bfb287358093a115a7a19cc2aa4fc91cc68339af59d4a540f38e33bb
+EBUILD cipher-des-0.0.6.ebuild 880 BLAKE2B 8ff947d1112a4a10b8cd8f796928f00bdf44fc13b16c6956200d966278616d7d2c213703c63372d7017938fc016c58a47e607a00ee150a8327460f858a087ccb SHA512 736590a05737cabd716df26a872b7a25c39bf9006fb77eaffd6ec66bd13a1e1d181b4c50ac9a118ee8c0b24928479829cb246487d6e3ced83f354a735ba5a319
 MISC metadata.xml 340 BLAKE2B fa7ffd27bb988c64b885de8879661929121e2833c146b373a23c2d649e58379dfcfd182fdc90d20116f4ab31251b379f0310a84040aa0bf6d7209ce9388a7873 SHA512 88ce6598988d5ac898de9b179e55518b3e68ffa9095a9ae194ea058340544c4d9f3ad9bd3f36d5ea8c50c3a52664140756ce19d91b06ec994fcf8d326ade85a4
diff --git a/dev-haskell/cipher-des/cipher-des-0.0.6.ebuild b/dev-haskell/cipher-des/cipher-des-0.0.6.ebuild
index 29d6d770a2e1..9a5cc8cee9ec 100644
--- a/dev-haskell/cipher-des/cipher-des-0.0.6.ebuild
+++ b/dev-haskell/cipher-des/cipher-des-0.0.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.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -20,7 +20,7 @@ IUSE=""
 RDEPEND="dev-haskell/byteable:=[profile?]
 	>=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
 	>=dev-haskell/securemem-0.1.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/cipher-rc4/Manifest b/dev-haskell/cipher-rc4/Manifest
index bfe131d257ca..9bd2ffb34433 100644
--- a/dev-haskell/cipher-rc4/Manifest
+++ b/dev-haskell/cipher-rc4/Manifest
@@ -1,3 +1,3 @@
 DIST cipher-rc4-0.1.4.tar.gz 4315 BLAKE2B 1af510c3689d578efcd84830a9d0cbebefcb6c78436be384fc73367d62b559ad0bba77b767a106cf97928cccfc282f85b4e8d16fdeb348cad913dccf78a2e735 SHA512 68415b4327371b4ea6fec9064f76c3a3372e223c3c717ee066941823cbbcdc50a7cd02c3fa7268dce4128e7b088e8a88012dd8478126d3f9d6a4e5b99f990d95
-EBUILD cipher-rc4-0.1.4.ebuild 850 BLAKE2B 39e85bc287507e82af59f41c91cac4a88bd343aba18f2df5c24bc1b902d51155e2ee713890cff207edcf068cbfb2f04b981f9477891b87829732a1f1165ce1fe SHA512 d34636bcae981db902715499b2b36efcaf742393ffa1248340833a06c5fb9cc3391954b2d5c7851faedc244e3a497fd33d290d67c4918ff6fce33c6203c339fc
+EBUILD cipher-rc4-0.1.4.ebuild 849 BLAKE2B e5c39af888e95954ed5e1dbed58b7175965fb0d8bb3daf2426866c108cbab1c9e079dea87aa07eee16df8c5a3f80c7b6d19dc4d18ce4cca6f7bca2a7e32a8855 SHA512 cac17c6b388c003756b127ef2c0b0ce0544484fb48ea847485214f13b57a3cce0f5bc05cc79c1b6de7b0b6a7f198eedbd8e85345faac4f00edaaf5ac496896de
 MISC metadata.xml 337 BLAKE2B fe09d768a944f1ffa747d1fecc107c56f5f67f55d0c2d192e99ad921deb2ce3194ae5663cd0e56e836c81e9cd8e2e16b4da7361a7df90c98a8fa371ecb59f69a SHA512 821d36a103239134141ef48f2d65f46e9911e9296be4de6628013a9120f74c922f5a99a17a57e8ee35bfbeec8bcfdca43007932a44540c96d81c43ad1054feb3
diff --git a/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild b/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild
index d75de3ee2005..dd96859ca8d4 100644
--- a/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild
+++ b/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.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.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -19,7 +19,7 @@ IUSE=""
 
 RDEPEND="dev-haskell/byteable:=[profile?]
 	>=dev-haskell/crypto-cipher-types-0.0.5:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/comonad-transformers/Manifest b/dev-haskell/comonad-transformers/Manifest
index 81bfe6f47d8d..d08fde290db4 100644
--- a/dev-haskell/comonad-transformers/Manifest
+++ b/dev-haskell/comonad-transformers/Manifest
@@ -1,3 +1,3 @@
 DIST comonad-transformers-4.0.tar.gz 2430 BLAKE2B 40de77da2839445abe984293d105fbadede706b32909119d941a49946f941d694a8f0278d1bd4d48560dee382bba75d820e1d49e249f445c5de2ed2285ebbc2b SHA512 5b35e80798691ba7defd030e03030491ffd6b4721b85f88f7596e75442b33c13eb6d2b8a91fdb47b76b05629a9008fde61ed0e1c87324f673a9de84510d2a668
-EBUILD comonad-transformers-4.0.ebuild 574 BLAKE2B 202cdf7658146706de21be2ae05f9a816baa0e4bcef5a524f780cd6e54469c0363982f7b57c63d8d1c4fdafd262cca2624318c87b8f0fe8d9e6ac43dcc38c921 SHA512 f4dd3457bfbccafe326666a3dfd0e4f03e88bad2d0b48412ebf91cd00a322a965f73f3f751f0db767419933cff9621ed90aa0ee56d035af116fd173407ec1828
+EBUILD comonad-transformers-4.0.ebuild 593 BLAKE2B 74b4494f11d106e6652ac872e17341f6c8f7c551f78d759c9b489f9b6b495692f57f8adaa95f95309b5460fac74ad01b509d22e2b4e3666d1cfc15a2b366686f SHA512 92b9297e9e5cc611978a89e47c23bb5ab70d19d3be820acc396dc8bb6f600be9a0035987634be57b79005714a8b9e4e97bbe5091f5b80ac652117537dae79883
 MISC metadata.xml 341 BLAKE2B d4444202e47e81d1134ad5490a9c2033c463dad4b4fef67f7189237e1107905f1a730e33a8b10839d084e17087e344ebb17b845a2f28d1b3f1300ad06b8a57b5 SHA512 eb5db024da6ba003515520e91f0d29f00b6790b2227179d6981ce4919b409b40e2c8784c736b7a78f3e088794e502c33ffd6a69760cfdc7b4b67a6807b11564e
diff --git a/dev-haskell/comonad-transformers/comonad-transformers-4.0.ebuild b/dev-haskell/comonad-transformers/comonad-transformers-4.0.ebuild
index d65d870bb1b4..9d6d8fbdb524 100644
--- a/dev-haskell/comonad-transformers/comonad-transformers-4.0.ebuild
+++ b/dev-haskell/comonad-transformers/comonad-transformers-4.0.ebuild
@@ -1,11 +1,11 @@
-# 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.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="lib profile"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="This package has been merged into comonad 4.0"
@@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/comonad-4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
+	>=dev-haskell/cabal-1.6
 "
diff --git a/dev-haskell/comonads-fd/Manifest b/dev-haskell/comonads-fd/Manifest
index 703001184925..7f88a75043fb 100644
--- a/dev-haskell/comonads-fd/Manifest
+++ b/dev-haskell/comonads-fd/Manifest
@@ -1,3 +1,3 @@
 DIST comonads-fd-4.0.tar.gz 2605 BLAKE2B 3d498483964cf10f3622aaa4097adabf70c2ef1d82c28025697e775fb4b6d88b33332235772001f6180279876bfd4fa1b3720762c7297c3c9c9d00f031d2cf5c SHA512 290a137c7485c5cbebc7994737a0c2a70ffb2463188cd491bf86b4e02edb5cc3a8c4fd7b7cfcfc999c6dfbed6bb437a63f44959ec34e4addaffd0a81a20125a1
-EBUILD comonads-fd-4.0.ebuild 565 BLAKE2B f1f757a9745aae73786d69df0a0fc3624c3a6a60f41d1982c541211d2163c13b6598210bdf912084038d26125a53fdc095ab39342c91789be0a90ab737dac6db SHA512 88e59277aef6446d150d97614bf97c9b695a6db8b5178b4db062498a7d6df7876694e6c4245f870dba3fc64ecbdc7901c33f23c4949c6b3764183184d69d2f6b
+EBUILD comonads-fd-4.0.ebuild 584 BLAKE2B b34d7ddc1538c74ad533a9a36f36b5c9068d31e8f3c66967b096a80822ea24ebe7af0af9336f50c42fd3ead0c0f8bff649861e45f7611845dcadf2c09221f138 SHA512 636288d20e5c80cdbd116a5acc0d9daa1b47b1301ac4699f2623779cc6d8ffc00c4b56efdab810ce15b7002a20f953014c5e0ee94696e9706969ad570a71302f
 MISC metadata.xml 332 BLAKE2B 990ae3c35c219322f41a44eeea78d9fef486943e9773d766eda67a4440aa5f586c3a547e7690f9f5e6e96629a0f57a07aac3493cc70556e21771445839fa6745 SHA512 6d61b43cbc9f5763e530b84e33e000ac7088407a1236fab469fc5cdb24dafb65674cb82ff77911e007851ebdade031b3b3c512e3781b5b0b7a56441651c37160
diff --git a/dev-haskell/comonads-fd/comonads-fd-4.0.ebuild b/dev-haskell/comonads-fd/comonads-fd-4.0.ebuild
index 926dccf4217c..578bc84089cf 100644
--- a/dev-haskell/comonads-fd/comonads-fd-4.0.ebuild
+++ b/dev-haskell/comonads-fd/comonads-fd-4.0.ebuild
@@ -1,11 +1,11 @@
-# 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.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="lib profile"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="This package has been merged into comonad 4.0"
@@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/comonad-4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
+	>=dev-haskell/cabal-1.6
 "
diff --git a/dev-haskell/control-monad-loop/Manifest b/dev-haskell/control-monad-loop/Manifest
index 01610c61aa49..deaf225f71a3 100644
--- a/dev-haskell/control-monad-loop/Manifest
+++ b/dev-haskell/control-monad-loop/Manifest
@@ -1,3 +1,3 @@
 DIST control-monad-loop-0.1.tar.gz 5081 BLAKE2B 8e9b755a7b37d90f8422794cc590cfc826665aac267bf28565d475adffd167ef29c806b644c87e9834eefa6d24ff7e554aa727a2a4069120d52a80112d57f8ec SHA512 a3eb80b06762ecf442b23fd39a35393a5754a7d71f4ba21e8a3a2457d8ee34a9b5d4b6c8f20d5c5fa19a42beb863bc2a7602bffd06db6ddc99f9b94ae2ec74dd
-EBUILD control-monad-loop-0.1.ebuild 648 BLAKE2B e9f4fc8c9edf6a6d1ea06abbf5d2f5c0637710f4b88de933b35ca55305ed20445dfb7db4a282a7f2ec173756c9643670ad4f5ecf1201f064671006aef72a017f SHA512 9f67146a47a6d823698a17cfd716e637f8fc4efb6ba26bbff919331650468c3f38443322ce6fd8328eec1fb6c232a601cc411e00fd8a6f68a3f04b2e4b132394
+EBUILD control-monad-loop-0.1.ebuild 618 BLAKE2B 68aa209273ba49697ab8fc55c2397e90588a9015b22ce902d6d055211a0c278ee19076e684f214a865fb0d39923183660090f13df69eb62bf18377ab04fc30d3 SHA512 a39ecdcee055343539f0f99ddc0b4c2a58d7fdbda09f0162b29816d6ac790e8b79ef3a60f12e4586e62f8131b731c60edeb00f09c23e6a9053fc5f65e3bc36fe
 MISC metadata.xml 350 BLAKE2B 53c43da1d99a93a6191f6cca59061cc70ad2feb2d85d8d423f9419af0cb35ff66716d4d8ee6ab2ba2e3106a5867ae3563b7abb32d512b40fa6d7e192ed737586 SHA512 ea71971bd660173ebd0433d9ad76c68de1861295267c385482d482448188bf802afae5775c6dc9233d82d97c5d4afb958592ffdcba128258cb946ab1c216470e
diff --git a/dev-haskell/control-monad-loop/control-monad-loop-0.1.ebuild b/dev-haskell/control-monad-loop/control-monad-loop-0.1.ebuild
index fb9cb7cfe5be..1b2062001ee0 100644
--- a/dev-haskell/control-monad-loop/control-monad-loop-0.1.ebuild
+++ b/dev-haskell/control-monad-loop/control-monad-loop-0.1.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.3.2
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,8 +17,9 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-haskell/transformers:=[profile?]
-		dev-haskell/transformers-base:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
+RDEPEND="dev-haskell/transformers-base:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/convertible/Manifest b/dev-haskell/convertible/Manifest
index 7a5f2d5300e4..f15e62373646 100644
--- a/dev-haskell/convertible/Manifest
+++ b/dev-haskell/convertible/Manifest
@@ -1,3 +1,3 @@
 DIST convertible-1.1.1.0.tar.gz 14354 BLAKE2B 8d60f3ed29732dddf68d9b0221aae12300533c79d2d2763fe09af143296bfda93bc1781b7d21034b4747b5bc18894db033ce16a7c4a3967f8c7c4f4429cb1f52 SHA512 cd36107b686c56a5d374efbb9be4fa8a0ec3504f0cd807870d34f279707b36721ce5639e22939d11d1795354e453fabe4f1b6130b06ec20ad597287f62959dba
-EBUILD convertible-1.1.1.0.ebuild 812 BLAKE2B d340fddbca97033340d4b750a6d2c6f9cc6854e9276a56fbd957777c835ab9424ad75412eb154eddd8c14c27917e2149461ca89147299eddcfb392244b92cf33 SHA512 bfddbdff50c4ecaf197d30cf625ad3533058cbd5b6d1811d66eb043160641a707ed609711ac51cf9820e7272fb1c978e5669ffbe521578097778125a77dc23e3
-MISC metadata.xml 633 BLAKE2B bcb4b69551be8d969d69408fd592561d9dccfdf3ab70d9aaf1ab1633c82971385dc4f7f04cf7e2f011a2de1697b7ee3e09e333f4b925328904c80c473b5632e4 SHA512 257966cf9d8c81c8d4961c285c2b739a5998731714e8e9b585797015ec076d08eaf4e40aa2ea8fea34c23e6c173d72224857a0c569af8e5536d3b2401cff2db3
+EBUILD convertible-1.1.1.0.ebuild 808 BLAKE2B ab83071d56cbe4cece35f7e019acbb4eb13888c6bc99d665cab899a5f47292d07c8341296371d434c70e093f27f84fda2d1712de4b47f940a96da51d37183881 SHA512 19dc8dddf4e6ee550ed7a2c87cab33475dfe5f6347df15d82e7645793e3862aead6d651796cb1494d863343b4a6808072030b911e7226f59cb4fed50edc6d155
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/convertible/convertible-1.1.1.0.ebuild b/dev-haskell/convertible/convertible-1.1.1.0.ebuild
index 254bbddd4a82..f45791f8a35d 100644
--- a/dev-haskell/convertible/convertible-1.1.1.0.ebuild
+++ b/dev-haskell/convertible/convertible-1.1.1.0.ebuild
@@ -1,12 +1,12 @@
 # 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.6.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: -buildtests
 
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Typeclasses and instances for converting between types"
diff --git a/dev-haskell/convertible/metadata.xml b/dev-haskell/convertible/metadata.xml
index 3c57bb78ce53..b7878815d80d 100644
--- a/dev-haskell/convertible/metadata.xml
+++ b/dev-haskell/convertible/metadata.xml
@@ -5,12 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Convertible provides a typeclass with a single function
-		that is designed to help convert between different types: numeric
-		values, dates and times, and the like. The conversions perform bounds
-		checking and return a pure 'Either' value. This means that you need
-		not remember which specific function performs the conversion you
-		desire.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/cprng-aes/Manifest b/dev-haskell/cprng-aes/Manifest
index e1895943f37d..76cae0ab5903 100644
--- a/dev-haskell/cprng-aes/Manifest
+++ b/dev-haskell/cprng-aes/Manifest
@@ -1,3 +1,3 @@
 DIST cprng-aes-0.6.1.tar.gz 4396 BLAKE2B 813773cb6185974e6c3250ce744abbe4ea5dbfa4725320736563fdea6446f246b704e2825e2f8612d35dddb01424cea93ad24a05764713d09d25cfe5afcaeaa7 SHA512 839a3a449edf996b0061a989058ed59625d8a849e852217c047b9d9b59b58504c0efaca699f75beea3ebcad8284f55c1f53b523dbebb10f56e705506bfccb5f5
-EBUILD cprng-aes-0.6.1.ebuild 776 BLAKE2B b82702c3a7397f44b71bf00d265be8c7c58f03dc965f6b9d5972f1bae1873bbea16cf92bae96d61066c24e4936d7cdadb044f541b2d22fa4b966bb87474e76b6 SHA512 a2676af7fba4ba55f8b3fd6c38f666dfe32fb1d10fff7f35219a68b19ca222a001d41edf0d5f1947defa43423a5e835b737249d5cdf14be76173971bdaa08bcf
-MISC metadata.xml 1186 BLAKE2B c757cbbda20b5af9af4347e0a462794803ae126274665b7078904dde092392ac1a1e1a00092139e4cc4a745efdfcb08c87469fe2b497e2e886aade12686d867a SHA512 e757226e7a8887b9540382fa998e22f9818c2f39f1d01e36772fae79821da9883ecc8d7914484b6110006ea2f0b3ee97b6e59d528b211b153c983ccd4094a4b7
+EBUILD cprng-aes-0.6.1.ebuild 776 BLAKE2B b33706da22a498e946bbb2ed2471601a61041d232dabe2265b65a4ef99c1d6c3fad1a8a046a7e74f8d2e05506f9539cd14fec1475df1520f58f755171c2df479 SHA512 88f9fa82dd247e628f4dbafa28f35d2916965918ae7d493ba9c4692ef31e33a7a9a48c2c3d4cb144190ed07f57ca8ff6066389eaf02cc1128fe256897f2212e0
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild b/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
index 3f7cfe98d917..4d824d9ab9a5 100644
--- a/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
+++ b/dev-haskell/cprng-aes/cprng-aes-0.6.1.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.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/cprng-aes/metadata.xml b/dev-haskell/cprng-aes/metadata.xml
index 9a0185abd6dc..b7878815d80d 100644
--- a/dev-haskell/cprng-aes/metadata.xml
+++ b/dev-haskell/cprng-aes/metadata.xml
@@ -5,24 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Simple crypto pseudo-random-number-generator with really good randomness property.
-		
-		Using ent, a randomness property maker on one 1Mb sample:
-		Entropy = 7.999837 bits per byte.
-		Optimum compression would reduce the size of this 1048576 byte file by 0 percent.
-		Chi square distribution for 1048576 samples is 237.02
-		Arithmetic mean value of data bytes is 127.3422 (127.5 = random)
-		Monte Carlo value for Pi is 3.143589568 (error 0.06 percent)
-		
-		Compared to urandom with the same sampling:
-		Entropy = 7.999831 bits per byte.
-		Optimum compression would reduce the size of this 1048576 byte file by 0 percent.
-		Chi square distribution for 1048576 samples is 246.63
-		Arithmetic mean value of data bytes is 127.6347 (127.5 = random).
-		Monte Carlo value for Pi is 3.132465868 (error 0.29 percent).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-cprng-aes</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cpu/Manifest b/dev-haskell/cpu/Manifest
index fd29ae4f0f60..fd351c7035f8 100644
--- a/dev-haskell/cpu/Manifest
+++ b/dev-haskell/cpu/Manifest
@@ -1,3 +1,3 @@
 DIST cpu-0.1.2.tar.gz 4317 BLAKE2B 17d34e81432a2487e74ff0297b8126c815d0034809290d28557bcbb5180b161fc474703de29f4bbd1fcf18887a291bbd2608f362752028f910a9c61d51847517 SHA512 2dab5b956619cad1a6a99f16a6156d5f2539ef4882204e3cb1ec3e86bc00cd4d948e3a5eba4948fd0cc37dd98a27eeebc77957f87af6e51f86a65a84db1d25d3
-EBUILD cpu-0.1.2.ebuild 642 BLAKE2B 499ce62559a9691ab1afc08f731102f7f7202357b4b3846926eab4e433373be92b30de768cf03f91a52f33966de5b7adbee7e5e87b25a0365f517b5cb3628b89 SHA512 41e37bad04b656efbd1db1b785798cf090da1e46a071c622b3e2ca61947139aade3310e1b3f8591a500b7ce1743799d92b902ba091382063fce5c23164fc6cfe
+EBUILD cpu-0.1.2.ebuild 637 BLAKE2B 0d22fed223b03e477b4c33b56ccc8519e39db985284afb9f660d0bdc5b1fe6cdf34bec9c3fdb6ca3e6c7586363a891ee98e145a0fb631d322151af3c31f64320 SHA512 20f2951fdbf263c14beba39b6470f23bf6d573881ff2b9040fe1baaf3d25eb0fdd1a03f360a23de88cb0435e1d9a9762e60856bdacb039b7fc1e164b3df136f1
 MISC metadata.xml 539 BLAKE2B c0caba5ac36639130cb46c870bf8432d4197b6002474aea9126fde612d914639814f4b745a3d9272c8440db88fd983bcc26cc8bf8dae2d897efd790e8e56aaf5 SHA512 e1484d14f8c8e582a758f9ca8902dc1f9716b6fc37787b869c53f795050b894d4722fd4a87e8ad0d3100326334930fc04afd35d114ed033909eadcee1e10d7fa
diff --git a/dev-haskell/cpu/cpu-0.1.2.ebuild b/dev-haskell/cpu/cpu-0.1.2.ebuild
index 9ade107d6e37..83f422c0e3b6 100644
--- a/dev-haskell/cpu/cpu-0.1.2.ebuild
+++ b/dev-haskell/cpu/cpu-0.1.2.ebuild
@@ -1,11 +1,11 @@
-# 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.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Cpu information and properties helpers"
@@ -17,7 +17,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="executable"
 
-RDEPEND=">=dev-lang/ghc-6.10.4:=
+RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/crypto-api-tests/Manifest b/dev-haskell/crypto-api-tests/Manifest
index c0cdeebb1243..33bb2b875cbf 100644
--- a/dev-haskell/crypto-api-tests/Manifest
+++ b/dev-haskell/crypto-api-tests/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-api-tests-0.3.tar.gz 3635597 BLAKE2B 0b13730ef105217068e8ffbe237dbe727e3ae09aefa4d0c021877010371024c5796e6959ad788edc5c213faf55e69cd5eea9d55023f48cb96f263ceeeb6e4500 SHA512 4d9dfd52dc67279a712bd444972faa6650d987c8f65fb41178e5c6523a7260c0e2df8f44bc511ffa217b6d71c5ec41ab11a0466a326c9133f7e20c01c37404d5
-EBUILD crypto-api-tests-0.3-r1.ebuild 867 BLAKE2B 50ba79491c72260716aa81f8ccc4add33eeff8cfa31236031848063b0f2ae5bb286d2cd5e111fc8ebdc3526ccb8ca702a44ae2ff423f7142bbceec93dabc2245 SHA512 47193a03309f85509b412d0e241cb6d48d76c4ccc6b7daec9f07b00d7a4c843d3774541038bfe4d619c3dfdfd81209fe103cd94ba662d8be836bd832a997cbad
-MISC metadata.xml 555 BLAKE2B f8ed536bbfe36a3fab22f312b39f7f2d9f94814608ab87f85ff00a72930aab5f2cec806844d1c637b9acd97149e657529f2b2ad42f5456446abaff940cf032d6 SHA512 fe598ebf4ea5b051949d2ef8b0d64170438d753928544b1c4dad41ad5e8eb317cf76d2e8f62c4fc21a1dec05f23de5da2affaeb60e37c6e34b182f2ebf25a997
+EBUILD crypto-api-tests-0.3-r1.ebuild 862 BLAKE2B 2954986b4ebdb59c089458ccca4e9da599129d4357791cb663b18b9f3a9f6372299f3016cfebcdd7e3401c3422fd0db7bf4f1c3d7d9437b9d92d9ebbc6dd16e2 SHA512 35b815aca00b4d718a102e55a42b0bda0a7e64377a3aed804f6796ff85ec8504967d936fcf6623aa086cde3b70b34de911b21dce45e64db8715d837df0ece7cf
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild b/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild
index 4246b77e8b5c..3a97aada6a03 100644
--- a/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild
+++ b/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild
@@ -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.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -24,8 +24,8 @@ RDEPEND="dev-haskell/cereal:=[profile?]
 	>=dev-haskell/test-framework-0.4:=[profile?]
 	>=dev-haskell/test-framework-hunit-0.2:=[profile?]
 	>=dev-haskell/test-framework-quickcheck2-0.3:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
+	>=dev-haskell/cabal-1.6
 "
diff --git a/dev-haskell/crypto-api-tests/metadata.xml b/dev-haskell/crypto-api-tests/metadata.xml
index d327429f980e..b7878815d80d 100644
--- a/dev-haskell/crypto-api-tests/metadata.xml
+++ b/dev-haskell/crypto-api-tests/metadata.xml
@@ -5,11 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A test framework for hash and cipher operations using
-		the crypto-api interface.  Known answer tests (KATs)
-		for common cryptographic algorithms are included.
-		Patches welcome (both adding KATs for more algorithms
-		or property tests for classes of algorithms).
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/crypto-api/Manifest b/dev-haskell/crypto-api/Manifest
index 5692166803ca..3ff45f1aca03 100644
--- a/dev-haskell/crypto-api/Manifest
+++ b/dev-haskell/crypto-api/Manifest
@@ -1,3 +1,3 @@
-DIST crypto-api-0.13.2.tar.gz 47877 BLAKE2B e9a10cdc7ab66ce4155856feb4ce4df93e7f49785fb9571f326377f9b5faf5a939aa625d9ad75bf31835b2a764bacb2a2a762b4d25c20faaaeedcfb205d20cb8 SHA512 2803862a714c3f448aa63469171fc68835ea9648a94d69ec76a32d20c1ed480aa3ecacedc3bf1e674797430c5d2966ceea4a83e38e827a68d2fab78fb4c8567c
-EBUILD crypto-api-0.13.2.ebuild 794 BLAKE2B 53671826f00e518cae17b98143da7d8d88cd3a0e13af63afab6c28714e3ec2d47b016e1c5d0adf52dca7ea4fca08771ff58b0813ab67094a5d60339193bf301b SHA512 262ce22562f2f63f009ee356211a861d61541da1277ac7c5f9ac2c62570a4fe80ee8edea1247f603bfd5a6ba3d5fb5e58be036baabb614f717fa5a21a9245ab8
-MISC metadata.xml 935 BLAKE2B 8c3cdcfd17af03e8616c8669f907781eabb2703f5ce1a9ee51bd2c644ece4e28a69d137564c509f4731791ce231472cea2914d05f409c0711f7e15451d321678 SHA512 9fad45175723d3d8027c7ff4422ece7c3172156e9b33b9c8dcba62d3a46a2334178f3bbeebf3e64b9a179c2c8f0c9e1d7e9b6dc994a8271d2815b075596706ba
+DIST crypto-api-0.13.3.tar.gz 48346 BLAKE2B eeec2644fe43218c8e647bd84e3fad31079cb560cb25a078853ae40cb8be617a05fcc55ca844811f1356d8f5a8088583497d79e38f808d12af4695bc05bba7d0 SHA512 1228fe857e235a0d5692916507a42e622f9769325ae9a6a7828270dcb64fe38cc094eec3fc8cad2f28b01bd8de98b1dc637a17aab1db1568a82cb91ebc65c382
+EBUILD crypto-api-0.13.3.ebuild 761 BLAKE2B 678ff18995ec520858ff94ff54c7a8cb3aed354b45bde7345d240486a83d598f089544c68b059b6165817d6780a544c73d7fdd58dd29e7f82bc10c1681c665ac SHA512 abc25848ae24e8e6dd208771ac1144955ab22ab6a452ea0c2fb273c397ed884a96249988d752ab961a6d6ba57601b171661e3b57ff54f2fcd0c8c9cb29c5b287
+MISC metadata.xml 854 BLAKE2B 7e9f3d34ec177bfc2b971d1f21b2a1853c4320690cd06a08e0b41d9395b012cb99b94e037d3f8bc7e33a3239d39b98017559028b7082391c7d91ca9926693d0d SHA512 77836b60296171219d10d2561a3d5630f2cd0f9ca0ea95f6c334ce31ac414552628be70d9c77007aac126fa153c1b06286ac1a8e21fb3fedbd65bcf77e15f116
diff --git a/dev-haskell/crypto-api/crypto-api-0.13.2.ebuild b/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild
index 982a547b9ab4..4b61011d2c68 100644
--- a/dev-haskell/crypto-api/crypto-api-0.13.2.ebuild
+++ b/dev-haskell/crypto-api/crypto-api-0.13.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=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"
 inherit haskell-cabal
@@ -20,11 +20,10 @@ IUSE="all-cpolys"
 RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
 	dev-haskell/entropy:=[profile?]
 	>=dev-haskell/tagged-0.1:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-8.0.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
+	>=dev-haskell/cabal-1.24.0.0
 "
 
 src_configure() {
diff --git a/dev-haskell/crypto-api/metadata.xml b/dev-haskell/crypto-api/metadata.xml
index 210ea2464604..df36a4e2914a 100644
--- a/dev-haskell/crypto-api/metadata.xml
+++ b/dev-haskell/crypto-api/metadata.xml
@@ -5,6 +5,9 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<use>
+		<flag name="all-cpolys">Build all the CMAC polynomes up to 10000 bits instead of just the usual ones</flag>
+	</use>
 	<longdescription>
 		A generic interface for cryptographic operations (hashes, ciphers, randomness).
 		Maintainers of hash and cipher implementations are
@@ -16,10 +19,4 @@
 		one cryptographic algorithm (ex: padding) is within
 		scope of this package.
 	</longdescription>
-	<use>
-		<flag name="all-cpolys">Build all the CMAC polynomes up to 10000 bits instead of just the usual ones</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">TomMD/crypto-api</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/crypto-cipher-tests/Manifest b/dev-haskell/crypto-cipher-tests/Manifest
index a58b506b1307..8ab1d229fa66 100644
--- a/dev-haskell/crypto-cipher-tests/Manifest
+++ b/dev-haskell/crypto-cipher-tests/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-cipher-tests-0.0.11.tar.gz 6183 BLAKE2B 6899bfff8cc9654656becb1ec21a7c3792a9b50141858ccc5678050daaec1f195ea5b9826cbb85e127f0e0c3236bb9dad94280a2c49732966453b1c0832b2d33 SHA512 cc8361517e6c2afed1585e7648ed1143e8b4224918fbd8191a970d0afe2a162b759e8e6aee49308a93bdfe0d4d15e2bfb587d4e9f6891766f8e834822553b853
-EBUILD crypto-cipher-tests-0.0.11-r1.ebuild 1057 BLAKE2B 631d03c633f2e200d261ebecf3b2cfd91c9670e83f7c905644aa4ba87d4cc3ac2907a1ded0d753e0ebee7e06da4c26ec8c3fa2919e55044a16aaee635ab4bbb3 SHA512 0a43ae1ce4a9ddefa728af2b048e13640e0946b3ce6ce784e1a7967ae8a6b4d11e421cf223426ab480321a5acf4d2e388eb897a0cef76a44d8f0243cf86f4afe
-MISC metadata.xml 340 BLAKE2B fa7ffd27bb988c64b885de8879661929121e2833c146b373a23c2d649e58379dfcfd182fdc90d20116f4ab31251b379f0310a84040aa0bf6d7209ce9388a7873 SHA512 88ce6598988d5ac898de9b179e55518b3e68ffa9095a9ae194ea058340544c4d9f3ad9bd3f36d5ea8c50c3a52664140756ce19d91b06ec994fcf8d326ade85a4
+EBUILD crypto-cipher-tests-0.0.11-r1.ebuild 1056 BLAKE2B 6d2b3554d5942726fa88a2fabce6bf04ce08d2411672646ddf9b05cb5102b89ed0622f09901fd03bb04940e1dec0ea7692b1fa2349de3553a1bc185328c21e98 SHA512 e6b6ed4da1f504be22631b767ee8faaf0b992e6dec80be6d572788d8c389448ceacabfdb66b566eb782d68afaf5bbd42d10884c91925ad01bbe512e110f0fec3
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild b/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild
index a7ccdd905aea..d693d59019f7 100644
--- a/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild
+++ b/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild
@@ -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.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -26,7 +26,7 @@ RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[pr
 	dev-haskell/test-framework:=[profile?]
 	dev-haskell/test-framework-hunit:=[profile?]
 	dev-haskell/test-framework-quickcheck2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/crypto-cipher-tests/metadata.xml b/dev-haskell/crypto-cipher-tests/metadata.xml
index 234d150ab62e..b7878815d80d 100644
--- a/dev-haskell/crypto-cipher-tests/metadata.xml
+++ b/dev-haskell/crypto-cipher-tests/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/crypto-cipher-types/Manifest b/dev-haskell/crypto-cipher-types/Manifest
index 907e3fcc3e9b..7bfda8bf690c 100644
--- a/dev-haskell/crypto-cipher-types/Manifest
+++ b/dev-haskell/crypto-cipher-types/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-cipher-types-0.0.9.tar.gz 8073 BLAKE2B 80f5349e31f04b591509382b6c475f0f65095b50646dd5cd785c037eb9be8193a011f060beeee42a37586ccaf69122804124fbb77ef46f894ed985d573481c93 SHA512 9b369dfbe1baa918f8b72dca0a6637634582629ccd46226a3a89813f42cca1e11ee738e1053503a6bc2863c04dd885083e6a09a5bda5a52dbf381e9f133e24cc
-EBUILD crypto-cipher-types-0.0.9.ebuild 628 BLAKE2B f90d2f28d1f465f729c677d1ee6f7fcd3c48402156f829242529c06805af27b778ea3c6178389e2bc96317bfa5e74358e533a48769202382f6de6c94763e2476 SHA512 5404f9d413f5d048e1ef664f5aa3b84863cde9753f83fe282f3826d775fc1a3747c158b97279315869ed80d159a851d0e1bc3b655b3d6405e841a49de81de538
-MISC metadata.xml 340 BLAKE2B fa7ffd27bb988c64b885de8879661929121e2833c146b373a23c2d649e58379dfcfd182fdc90d20116f4ab31251b379f0310a84040aa0bf6d7209ce9388a7873 SHA512 88ce6598988d5ac898de9b179e55518b3e68ffa9095a9ae194ea058340544c4d9f3ad9bd3f36d5ea8c50c3a52664140756ce19d91b06ec994fcf8d326ade85a4
+EBUILD crypto-cipher-types-0.0.9.ebuild 627 BLAKE2B 29d7a5b93d44f0b3dfbd3bc7572f18cf6014a97d311fe712cc0809a55ff71a4bf129701348b3a50f7f908cfa82a51aa321d44042004a0ca5e267e2810c448116 SHA512 724240082e0dac08d62c98267e935d8664b522746f552d96595cbe2ab7b0e1403399770475a1f323079a49fa8bf821279eccbcda32792fdc7dda647c3ab4afc4
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild b/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
index ffa134fe1227..c1aa468bbc5c 100644
--- a/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
+++ b/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
@@ -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.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -19,7 +19,7 @@ IUSE=""
 
 RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
 	>=dev-haskell/securemem-0.1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/crypto-cipher-types/metadata.xml b/dev-haskell/crypto-cipher-types/metadata.xml
index 234d150ab62e..b7878815d80d 100644
--- a/dev-haskell/crypto-cipher-types/metadata.xml
+++ b/dev-haskell/crypto-cipher-types/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/crypto-numbers/Manifest b/dev-haskell/crypto-numbers/Manifest
index 0e3d35d42f04..9674d71e5a4d 100644
--- a/dev-haskell/crypto-numbers/Manifest
+++ b/dev-haskell/crypto-numbers/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-numbers-0.2.7.tar.gz 16064 BLAKE2B 52e7373d56f87d46f585e36019e2fc1ba3f1710ec2530a14069a839b348859e1f9ba784ea91c7241d767d488a15433f0381e5249775f9501197ecbcd051f8aeb SHA512 4fac18f6d76d5cc9ae82d177a45c155847264494dd112db80a76c955faee4917b4b3c563bb76eb3a08923bb020138307a7115d78fe0caa20fd3fb2b12d679947
-EBUILD crypto-numbers-0.2.7.ebuild 919 BLAKE2B 75d15f60384f70e3de37d4828006724693cac25bc80bc27838003b42345e5d3db0469841de8740ab477cf96535c5201823e856772389d51b944541abbe7daa33 SHA512 a53abae8f603f21191cc43a38f96c5251f8403f5067427cc5e94c1c7f32c51285030db37d9ef8941db9e4e0ad64cd9627f74b66acfc0ff7857b980dc91ba94e5
-MISC metadata.xml 341 BLAKE2B 00dfa4aa603e20dfdd38b10d0ac01be6b0f981abb42bfacf57efcdd69d747de02c8039205a926b10996b7c5b0b3272fe9e3dd51326caffc2a237c4fe7e6ff8b8 SHA512 da9bcd8fc39b8b2a48019b0a6806c199050e531d48954e9c843f06d7a41e63540b3e319f6f4b2ad6da0cb8d847d2b45e2c3b7b27297ea0c4dbadcf613447a286
+EBUILD crypto-numbers-0.2.7.ebuild 919 BLAKE2B de18766a6fdd43ed8852f981c2fdf2c25c45d66732b58742249c671b548d0828348bd22d50114c16866028b65d86387a455b824cbbdd70bc83fac2ab527978e5 SHA512 3857125a5a852be350abd25f14fb35dc638164eed8dd832832fabe8868726a5acedb2dfc7cf2675ba3a3741d1d96742c15a77e6e8ac3d42411c28118dacdfa2c
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild b/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild
index 7f5489f6fd4d..0ef405416f76 100644
--- a/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild
+++ b/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.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.5.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: integer-gmp:gmp
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
diff --git a/dev-haskell/crypto-numbers/metadata.xml b/dev-haskell/crypto-numbers/metadata.xml
index 2207cd8bd79f..b7878815d80d 100644
--- a/dev-haskell/crypto-numbers/metadata.xml
+++ b/dev-haskell/crypto-numbers/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-numbers</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/crypto-pubkey-types/Manifest b/dev-haskell/crypto-pubkey-types/Manifest
index 0f582d81dde4..d51c21db0cd5 100644
--- a/dev-haskell/crypto-pubkey-types/Manifest
+++ b/dev-haskell/crypto-pubkey-types/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-pubkey-types-0.4.3.tar.gz 11234 BLAKE2B 8b2b0fc64c6b4355264826d01de7457fddf82003748a29d636d52368874dbbd53f303e3bbad5316e9c5ac9fec3cb9021f60e0b749bc2147c15a6ffc9afc11ff8 SHA512 08e6b74ded0decaaf87b4b9ec15af2e8bbeb7095701b5e2062b570af1ecb3d25eb706d6bd91795acfaaf7d09d0e9040359736a0a06a1bc593ef0d8aaf3e374d6
-EBUILD crypto-pubkey-types-0.4.3.ebuild 684 BLAKE2B 1e78d48ad078f96827e657f98dbee94a20ca8dfd10a72b1e9b84bef2ab699a998fb632d0922d7f298bd1e64f46d0e25ad910ca2901aa01cbdfeceb3b42b2e112 SHA512 d9246602f8aeaa7fda6e60b4a7b6e0e066e5569d3f38a0c74ca6948195df8eb634043ef4c529a0e72be7e20da1c6d91a5123830ffe14dd2272f08ac4f90c947f
-MISC metadata.xml 346 BLAKE2B dae75702be59abad483a8426c979f76bc79d829f5ff0c11008267c45ee81d78793cde671f976c700eaaf785e526e17ec146fe92ec3b07dc3c48fb097e9b48bec SHA512 9f93bbc94854f92a11679187fbace248fbd815a1b60813ba75fa03f77a4ba3edb45edefb1e59608abfd0bef329e11d27659831aef79cb4b74c326e5de4f07b87
+EBUILD crypto-pubkey-types-0.4.3.ebuild 684 BLAKE2B fcde424aa1fda569c8e340611e7e14b6f133d024b3586b1c259b187f835eb581d516227cc8343a20a30200aa066b38cbb7d8629706c0e0e1261a3640e60c2e4d SHA512 3e28fef0d1370d6e5cc0588fc2ab652c022d0d4d7ad69b5495f8a39effbeb5233bf36f03bafc4913371f19df86989ee8ed390b64c728df21393b8a12d3ae8184
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild b/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild
index 4b4635f40e7c..244c93521778 100644
--- a/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild
+++ b/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild
@@ -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.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/crypto-pubkey-types/metadata.xml b/dev-haskell/crypto-pubkey-types/metadata.xml
index 21f92d57714c..b7878815d80d 100644
--- a/dev-haskell/crypto-pubkey-types/metadata.xml
+++ b/dev-haskell/crypto-pubkey-types/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-pubkey-types</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/crypto-pubkey/Manifest b/dev-haskell/crypto-pubkey/Manifest
index f42392446323..3cacfb3a204d 100644
--- a/dev-haskell/crypto-pubkey/Manifest
+++ b/dev-haskell/crypto-pubkey/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-pubkey-0.2.8.tar.gz 46405 BLAKE2B ee04b805204899ec6fdc1cfcda7a1ac83010805396308f9be7b2e885d52245f7ac77ad9caa7028afc2a3deaa594126a36ab4b93631227cf274e40dacb252b56a SHA512 9e7d54421fdb3c53964688831a2ca5f5379e141e7924af76916d868300833c0dbde22392e1452f80aaf2ec7a9a52de6b429a6f8f78b8fbef6c32f2f31202ed06
-EBUILD crypto-pubkey-0.2.8.ebuild 1000 BLAKE2B c7fc3fb48488c04e2d0b5e1dd86b17e8f24a7535c3483c79ff630881db400200d946de61755acde5f8f032df8429ff0f577b62c7b4301d41bc88b9bbc3ba2fcd SHA512 54e2e2b0882757e802a7b781138a2b1292f88f2c49aa9ac1587e607199d785a2c2d7beba9aaa7929a918916ec64fd45160b7e212a7271a1c505af3f306661596
-MISC metadata.xml 550 BLAKE2B e4921e40eb276a11ba0ee29e7cfe8acb8d03ba4cae9f86ad4d13b4281971a0284a0cb1be9d88db5342fd48533cefbc10b88bb689bbd336d8176919b7e1cb8fad SHA512 6bc022c97cb51ca0de160f9152ca0a3eabc143ab3c35cc4de6a06f76ad559a87ab931db7dab4358ab05f750528f1e393ed0ec9b490ed7c1f06821bd1c443e195
+EBUILD crypto-pubkey-0.2.8.ebuild 1000 BLAKE2B 1c3786794035e1c6edb066fa9d9a64c92a30bb4d8de4830508f5be559780901bf3ff37d152e117a55d2f0286cd4c7c17e92035af25f9758f546c0e9a16bf7641 SHA512 386e7c4b2dfdfa3a4f38b5273a6d601e78709fcaf9e320c0532b5d8f482780704d851ab13afd96ea920d6bb9ff6c5f9e42a10c06b3265514d6303c2455579f9d
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild b/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild
index eb419ccd7dc9..a73652cf8df2 100644
--- a/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild
+++ b/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.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.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/crypto-pubkey/metadata.xml b/dev-haskell/crypto-pubkey/metadata.xml
index 07093d50668a..b7878815d80d 100644
--- a/dev-haskell/crypto-pubkey/metadata.xml
+++ b/dev-haskell/crypto-pubkey/metadata.xml
@@ -5,14 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Public Key cryptography
-		
-		Supports RSA PKCS15, RSA OAEP, RSA PSS, DSA, ElGamal signature.
-		
-		Also have primitive support for Diffie Hellman, and ElGamal encryption
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-pubkey</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/crypto-random-api/Manifest b/dev-haskell/crypto-random-api/Manifest
index 4c44aab8c68a..986639cf5e7c 100644
--- a/dev-haskell/crypto-random-api/Manifest
+++ b/dev-haskell/crypto-random-api/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-random-api-0.2.0.tar.gz 3397 BLAKE2B b0a895186bf6c4f9487777eb7a86404d5972fa5af6002f2692a234ff608fe6c4f28f2d6cd69f2fe4c60953f2fdf67aad5293ffc7396b729e478bb59fa060c416 SHA512 8f7df05e54e053456e3ebe9394b19beb2a37dfed30cfb5fb673f591415dc6fabe105af51e838fbe73ef078906d94562080ca465b0c6b4e1537bd4a6e066244f7
-EBUILD crypto-random-api-0.2.0.ebuild 605 BLAKE2B 7da4be99a57b00affdb952e628bc4ca56b6610400b5956d16e06ee40db4e15b5dc758df719f174688ff939e5d0c1608122b591dd81341d8bfed47c3a89c9517d SHA512 66606b1ad2cec5ad91c7780fd8f085be3f07dc7a26f35651377f8f68c41b80afae33a4d1813a92d7088beb2430dfbea0669400ee7c5b3d30ffc427d18c22eb9a
-MISC metadata.xml 344 BLAKE2B 975bdb57ab0b5d35fd4389a7221e5d800eebe0069927e747d7b7cf2ef5c83a9db5c84c9d702e80133f7250913d2ef743c68a2ccbabe5446deafd9757239e6373 SHA512 7b646025b3d3daf4fa598027b6d25c80fd8e4f34d5c631dd53c3adde7eb3851518eb9d7f01a850bc339fc93ae2673f1f9f38368c43c688db7172853cd6fa773b
+EBUILD crypto-random-api-0.2.0.ebuild 604 BLAKE2B 08cd874dcd8800ece7fae6b93f9750843a9143716a1bb70faa27f2638b410eaefa74fa3aba0efe6375504ee8a09dc3117a04297c65faba8e33dff1da8872f6b3 SHA512 2b1b37609fe8b793886ca828cfeb7a2064b13819b044132b59389dcea3c3f445b9c3954ab9d461b3a22e48ba261d782f4565e91b908251ae7fb4730651de7849
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/crypto-random-api/crypto-random-api-0.2.0.ebuild b/dev-haskell/crypto-random-api/crypto-random-api-0.2.0.ebuild
index 0702d0576abf..5d54d7736e7a 100644
--- a/dev-haskell/crypto-random-api/crypto-random-api-0.2.0.ebuild
+++ b/dev-haskell/crypto-random-api/crypto-random-api-0.2.0.ebuild
@@ -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.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -18,6 +18,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/entropy:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
+	>=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/crypto-random-api/metadata.xml b/dev-haskell/crypto-random-api/metadata.xml
index 0f1ba7c6d718..b7878815d80d 100644
--- a/dev-haskell/crypto-random-api/metadata.xml
+++ b/dev-haskell/crypto-random-api/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-random-api</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/crypto-random/Manifest b/dev-haskell/crypto-random/Manifest
index 0e7f26cc74e2..02815b11c5a3 100644
--- a/dev-haskell/crypto-random/Manifest
+++ b/dev-haskell/crypto-random/Manifest
@@ -1,3 +1,3 @@
 DIST crypto-random-0.0.9.tar.gz 9256 BLAKE2B f9433a75c7285e92feda4f5d3db165c0f530d59ab95f733755c138bfaa162b0948b84ca912dbf26fc80b06d5cee7670361defa308d1ea5926a0e1cd385d39976 SHA512 07e298e2e3846b48330af92a46ab8550982ad74f6154c59a531762d9282f6712c1e867a48ed6cf4d967f463f52c1af4287a74552aeff0635480ea21cd54a7a24
-EBUILD crypto-random-0.0.9.ebuild 617 BLAKE2B 199ea7db13a0c3ef541c7423246dcfcb9b5b338cf29acd656208b73ee13ed9685593fbdffb23b4ef180e00e3acca6b2f7c4837e2abbf72e768c26b73bd0dab65 SHA512 33b66d38186c327f60ebd71cca32529b55ffe48cb81785afaf9e77bfd7d8e871e51c01f3617ea141d1050f3d036edc52954ddbaee8930acf38f97111e9e957c9
-MISC metadata.xml 340 BLAKE2B a3e830e9c4a5a385a40e9c297adcba2e580a695d2a01d201736ad70bbe86be93abd9d6cec1e7b8d7126742df0ef87d8633a5bf7ddb5845b6cecd0102a326e351 SHA512 d415082d43f67a42e1829bf50754529d4e0675036a180c86f1a7d6e27fdf3b79e424e0dc9feb29078e9f5bd0c89c52b4fa7fff8a9a9292a0e01d3bfe8806661b
+EBUILD crypto-random-0.0.9.ebuild 623 BLAKE2B 88dcb3f80fd6153ccdc8df3d5b89aebcba11289e252d9a0c392a06196e59d31ed8a5e12a117b395b8c31e0b4dd8afb92fc936b9aeded6aa42908ca8645068960 SHA512 1f38cc0a02b6d9e8eb88efd67117c3de02f243c9ce566d86223c3843c43637b1ee3c8dbdd0841b0c974c86f3c1513bacb8075f4fff6c6f7f636ee71111a24b42
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild b/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
index 075a5fa7ad44..2e6583961759 100644
--- a/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
+++ b/dev-haskell/crypto-random/crypto-random-0.0.9.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.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/securemem:=[profile?]
-	dev-haskell/vector:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-haskell/crypto-random/metadata.xml b/dev-haskell/crypto-random/metadata.xml
index 881710a87866..b7878815d80d 100644
--- a/dev-haskell/crypto-random/metadata.xml
+++ b/dev-haskell/crypto-random/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-random</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/crypto/Manifest b/dev-haskell/crypto/Manifest
index 544df0747a90..947b6e827792 100644
--- a/dev-haskell/crypto/Manifest
+++ b/dev-haskell/crypto/Manifest
@@ -1,3 +1,3 @@
 DIST Crypto-4.2.5.1.tar.gz 56474 BLAKE2B a5e86c4e161b1e89c37b3feff1fc3a30911cf6401a7bb6c3cb1d605fb2ebb5bb145ff2a398fa6fab59e194e1b5f235eb8212f3ac70b21c32202173d0d15dff65 SHA512 3b965f6a06784d3e8996aaae2622fa5b8e4a645a324618ff497f565230a8db525a0a5305d5cc5166283b2a24242df4554b29eb015326d416dc705f252ef456ac
-EBUILD crypto-4.2.5.1-r1.ebuild 1098 BLAKE2B 1189dfaf988dc0057e083147b3557a9fd39d88cd94b75964b7c7e391df85213beaeee8d230768325dc337b134958ef6f3c92c0a6d45b11996554f5e3da20f5de SHA512 503c8293c90f95937b6ae192c890958caba1d7639449c2046ac48f40dbda0c2888066855aa5b9fc54d0a75fadcec7dc1ac555e1e170f1338b1fd0b343a9228e7
-MISC metadata.xml 547 BLAKE2B 9c2abb3770b4858b3bc4a3ea0239bc0b48c5d9b6fd132d0db28488a48fe554f26e0e8c65aeb71a7ba042a271350a1eea882f3cf636a3eb2825d9017f510f8785 SHA512 cfee502ca5b3d23d9223a97a0e1b928955be0f9fc8552e988aeb5e25f515ab2dc6a7578b2aa5f930400c7807835c29ba7e9103165a2a0a330d4f5b88c2f907e9
+EBUILD crypto-4.2.5.1-r1.ebuild 1101 BLAKE2B 70b3f76f754b00ab7185fa06279955e4a6047e5898b61379179d5324451f62652799f53ba6c1e114532e70cdbe8d64140fb2702ec6b15915b2624ecaae91773f SHA512 51f233d7b499695a5d7006f32970b48dbcb6be1e972773f5da730e38bc21b39281bd3d1ebe9ebd08182ba2a12dd4dfc99760d0d5fa674063cb1faf1e52c715f6
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild b/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild
index 221307abdb08..f7d2aca9c061 100644
--- a/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild
+++ b/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild
@@ -1,11 +1,11 @@
 # 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.3.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 MY_PN="Crypto"
@@ -21,11 +21,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/hunit:=[profile?]
-		>=dev-haskell/quickcheck-2.4.0.1:2=[profile?]
-		dev-haskell/random:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
+	>=dev-haskell/quickcheck-2.4.0.1:2=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
+	>=dev-haskell/cabal-1.2
+"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -40,7 +42,7 @@ src_test() {
 }
 
 src_install() {
-	cabal_src_install
+	haskell-cabal_src_install
 
 	rm -rf "${D}/usr/bin" 2>/dev/null
 }
diff --git a/dev-haskell/crypto/metadata.xml b/dev-haskell/crypto/metadata.xml
index 2dbebd8cd714..b7878815d80d 100644
--- a/dev-haskell/crypto/metadata.xml
+++ b/dev-haskell/crypto/metadata.xml
@@ -5,10 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		DES, Blowfish, AES, TEA, SHA1, MD5, RSA, BubbleBabble,
-		Hexdump, Support for Word128, Word192 and Word256 and Beyond, PKCS5
-		Padding, Various Encryption Modes e.g. Cipher Block Chaining all in one package,
-		with HUnit and QuickCheck tests, and examples.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/cryptohash-conduit/Manifest b/dev-haskell/cryptohash-conduit/Manifest
index 6132dedce1c4..3fe5f16bae75 100644
--- a/dev-haskell/cryptohash-conduit/Manifest
+++ b/dev-haskell/cryptohash-conduit/Manifest
@@ -1,3 +1,3 @@
 DIST cryptohash-conduit-0.1.1.tar.gz 2318 BLAKE2B 3bc4d926d020b899c34169211b4b74394260e222e098d5afbc886898a45205b13cb89661699ae169f20a8ac092439463e74b5dffeb65131b891126ece5e80c6e SHA512 6382a05b35bae34b53fd1ad6d897c25ca149ed852360c8f775587efcd3c29e45ff854f96ddbc9b446e04a4dd5698b1f5e2af754345f7d5af8f587b73b57fdec0
-EBUILD cryptohash-conduit-0.1.1.ebuild 714 BLAKE2B 6b089b23a741a8628e3150329217f2dad94e12b212d122fae6130d23a01e2992816be7d617fb54ad3427b8325febf8e372b90cfe98dd86017551c1083c48bb03 SHA512 d7f95a5294379fdaf40dcfd9fc513dfb896cacd06de8ee7d3a12255fcd12ebf5058dcccf33028318b59b6ca3f4e1573c97903427f779460d00b7e899e7b9a19c
-MISC metadata.xml 345 BLAKE2B 7814e3a7e544d85d9af8f3a7fbd12a2dfc962740c35d977fe8ede8bfa01c5f4dec0ff7a6a91976064d40414365d392aa1eea845838a98463cc3081eeb0a857c0 SHA512 5d4b9af947d2f7e798fe28a384afd89549d518f55feb777e2c50b440436075c8c73d69ba77c0b19be7c496e429d129dbd847c5ba6b0ef668878eb72c25d03f0d
+EBUILD cryptohash-conduit-0.1.1.ebuild 680 BLAKE2B 08554a2f3879cd4bee81d172481b17d6cb10eeb632a5447b284d52f672eb826372fac9c8a9abd68933af8960dab9c0de310c421f7b71c24bdd563387e73e2911 SHA512 d6071e64e21ab978617a346fe8124cd2cd7296bf374d31722c680627ddc34228e2dd4b33315bc08eed5b462480f150cad309298e4055970dd9fb3436ad727cc9
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/cryptohash-conduit/cryptohash-conduit-0.1.1.ebuild b/dev-haskell/cryptohash-conduit/cryptohash-conduit-0.1.1.ebuild
index 60b957aa809c..068862d1158d 100644
--- a/dev-haskell/cryptohash-conduit/cryptohash-conduit-0.1.1.ebuild
+++ b/dev-haskell/cryptohash-conduit/cryptohash-conduit-0.1.1.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.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -21,9 +21,8 @@ RDEPEND="dev-haskell/conduit:=[profile?]
 	dev-haskell/conduit-extra:=[profile?]
 	dev-haskell/cryptohash:=[profile?]
 	dev-haskell/resourcet:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-1.18.1.3
 "
diff --git a/dev-haskell/cryptohash-conduit/metadata.xml b/dev-haskell/cryptohash-conduit/metadata.xml
index 7b26805ef71e..b7878815d80d 100644
--- a/dev-haskell/cryptohash-conduit/metadata.xml
+++ b/dev-haskell/cryptohash-conduit/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-cryptohash-conduit</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cryptohash-cryptoapi/Manifest b/dev-haskell/cryptohash-cryptoapi/Manifest
index 85f75ad9cb14..728950abbf12 100644
--- a/dev-haskell/cryptohash-cryptoapi/Manifest
+++ b/dev-haskell/cryptohash-cryptoapi/Manifest
@@ -1,3 +1,3 @@
 DIST cryptohash-cryptoapi-0.1.4.tar.gz 3094 BLAKE2B afd5169c172965eadacf9113a03a58cfff9350b63c339170788585437777deb41998322ea3d33f5d9c2c77b4f927e4457bfcaf8f4f92c6f77e85bffc51c02a47 SHA512 f5add1c8922e682d5d08073d0a3d03c6d5545f38edd90821bad7a92f354203ca380ca7e302b4b259bb9e2ce6ae09b1a2428e981e2d745a4a1b1a5cff696621e2
-EBUILD cryptohash-cryptoapi-0.1.4.ebuild 746 BLAKE2B 7b36dc3f5f688e59afde1ec04b409986196f51dfab9c707520162c84623490cdc5dcd1a71ae0159772a13fa3b8bc6c0dbc2bc628dd8a29d1b7a9d0a694f4ba68 SHA512 e7cbd605de5e811933a51f90a65b26f6209140463abb79b64e7468c4a5bab664a1bae285b6e5947d1ec6ad22c86bb9dec0fb4e58ece5586086ad056bcd368bb3
-MISC metadata.xml 347 BLAKE2B 0437ce30c9f9ca7d0e2d9a8ef223804a989a2ed47dbb41d79292ac2d8dac1913cd810277410a46d7fc9ead31532eb6734719f1c74500ed309b00a50a6449235b SHA512 03fdbb5af0047787584c72c965450558094efc23d6282897a0ed9566e3bc17c27a223a047bfbeecfbc4d562043cf1bbd21788c1fcd96a27a66eb2e3da3173624
+EBUILD cryptohash-cryptoapi-0.1.4.ebuild 746 BLAKE2B 1e5f4342510aa17253298fab5e6f4f441a3278f1007cb86aa65a7ba9938839dfa1fa1986cb94337ea049e2c01fa9d35329d79d3958a2f8eaa4c80cdfab035574 SHA512 53e47ab29bb1ff3b3eeedc48ad4f10e566feff5595d1149d55225302636f1fe3b382d8281f9888da69c73aca18b8bf59a8d54447d2789263dbd3b6e80cbf9b22
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild b/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild
index 80f54c1e6f27..dfb8b98df70d 100644
--- a/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild
+++ b/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.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.7.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/cryptohash-cryptoapi/metadata.xml b/dev-haskell/cryptohash-cryptoapi/metadata.xml
index 0a47c5b14690..b7878815d80d 100644
--- a/dev-haskell/cryptohash-cryptoapi/metadata.xml
+++ b/dev-haskell/cryptohash-cryptoapi/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-cryptohash-cryptoapi</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cryptohash/Manifest b/dev-haskell/cryptohash/Manifest
index 7f8ce583eac4..ead396a6bab6 100644
--- a/dev-haskell/cryptohash/Manifest
+++ b/dev-haskell/cryptohash/Manifest
@@ -1,3 +1,3 @@
 DIST cryptohash-0.11.9.tar.gz 25762 BLAKE2B a97de6b08f58ead9d51ae2042a52237d3cbea4eeb5d0138f4a90b1d65d545990297fd55ebb53d8458582790289b5a00eb3a82d1d08288e8ab100afa910a488e9 SHA512 d0eb07f59ae893df1a92a4dc45a98142e507ba3da25057ae4acf781b1b6200a2fb68dd2a19f1ba5f9395217bc81e7be1311a479dc3dcb4ec5338518a2f5239af
-EBUILD cryptohash-0.11.9.ebuild 838 BLAKE2B b69e1fa323c62eaea267122621ff7dc81c32efdb28aeab4fc53560232466b4735d2af7cc5e65cab045381ddc27cb21ffc78aa3dcb7f9a911146fe27cb4bb0def SHA512 8d07a587049990168a83f95818c966922b20cd58708978f8fd2063ed28729306e55eb22ad32bd747aac5eeb6e5377a7d248082574eb3bbeec64e4b7ee51d3f23
-MISC metadata.xml 648 BLAKE2B d6f126f767f72938bcf885199bc5e5fb261724eaa6a79a1b019c5bce7fe13b4253bccb589a8e164692efdfca342fca0024069fbbd60a5629aebe76cf7613d26a SHA512 b0a4396a78ee4135a07e036fb144c54c106cf0ac694739112d8cf4b917a3c95c2014bfc4966e84a57cafd0dc0ee885c0145ee9b089e9af05f34cbcc60c03aa9f
+EBUILD cryptohash-0.11.9.ebuild 838 BLAKE2B 9b601d6e6e292547633311987385b816b9558ed2535d05f6a700e3b9d0ac48dce04297f10a0be55464c5d3102028f901bc837783d6ac488c1514c71b6404c106 SHA512 020b92a97707069cfbd43e4dd4c28c6046c6c19a62154cb6dc630c0c2f181addf145f24736c69d8b4d8a3ee5324aeeb539329dcc24158265e02fdb921a3a0240
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild b/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild
index 96f3a8860c4b..a4925105ed4d 100644
--- a/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild
+++ b/dev-haskell/cryptohash/cryptohash-0.11.9.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.7.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/cryptohash/metadata.xml b/dev-haskell/cryptohash/metadata.xml
index 988b52cfc6c9..b7878815d80d 100644
--- a/dev-haskell/cryptohash/metadata.xml
+++ b/dev-haskell/cryptohash/metadata.xml
@@ -5,13 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A collection of crypto hashes, with a practical incremental and one-pass, pure APIs,
-		with performance close to the fastest implementations available in others languages.
-		
-		The implementations are made in C with a haskell FFI wrapper that hide the C implementation.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-cryptohash</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/curl/Manifest b/dev-haskell/curl/Manifest
index 2add0c3021e5..b3185c4d1a37 100644
--- a/dev-haskell/curl/Manifest
+++ b/dev-haskell/curl/Manifest
@@ -1,3 +1,3 @@
 DIST curl-1.3.8.tar.gz 47704 BLAKE2B da95451318561b9d8ab478479f8f6c147c36f86c4a89b112eb597202e2ff6305597ab200ba1e89b953dbde77cd043a3299614d5c19b83242059bd6e89906eddb SHA512 00012fc9b0a80b0d306f688bfb9cfbde8aa72045e6a139c0d8a0cdd7832b5e86ab06c6ea95803665f4bb8ec4e9af3dbc6e405f100985c2cfbaead8527ba7a382
-EBUILD curl-1.3.8.ebuild 544 BLAKE2B 0cee7af6d576e3594f64ce1becc81a35ae798cc915ad2580dbde2f52f2fc3d05c8e3c76c60b65501c32865e9824bfee393dcc2d55782c88d7d39eab0cdf85268 SHA512 bec237df52026762f0fee675ca781a5be567160b3775898c121d7ef4a3737c8e10f8b253f3b07e1dfd292d5b9676ac3c76a8523e54f5c7af58d92b95c7f743e6
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
+EBUILD curl-1.3.8.ebuild 545 BLAKE2B 8b3da3cccab4d81a1206c0a1979afbbf1de217bcdbedb925c196a48f744b34f7e575819341dd3ea5c78cf73988dad91948d10cb7b56cfd187c29abda2b5ef44a SHA512 5cc1e7fac6724d1c98f778868ba7f8e889afafa3973f24a0247fd2b202dcde4f6d11c83edba6e93647f3a7420b068693838174f63d18ce655ae263af9c5181d9
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/curl/curl-1.3.8.ebuild b/dev-haskell/curl/curl-1.3.8.ebuild
index 769be0b85aed..f87b9a2c5847 100644
--- a/dev-haskell/curl/curl-1.3.8.ebuild
+++ b/dev-haskell/curl/curl-1.3.8.ebuild
@@ -1,9 +1,9 @@
 # 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.3.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,7 +17,9 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-		net-misc/curl"
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+	net-misc/curl
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/curl/metadata.xml b/dev-haskell/curl/metadata.xml
index 522384de8446..b7878815d80d 100644
--- a/dev-haskell/curl/metadata.xml
+++ b/dev-haskell/curl/metadata.xml
@@ -1,7 +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>
-</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/data-binary-ieee754/Manifest b/dev-haskell/data-binary-ieee754/Manifest
index 138a068b3a51..d091cba104e9 100644
--- a/dev-haskell/data-binary-ieee754/Manifest
+++ b/dev-haskell/data-binary-ieee754/Manifest
@@ -1,3 +1,3 @@
 DIST data-binary-ieee754-0.4.4.tar.gz 4117 BLAKE2B 012ccb5cb3bd94b15a8326011563b1a2e3c28699d3819675822cd27372e6b81d527ad84fc20a054a2a4e8d14ba821bdce25393ab12042eedc64cb88064076d0c SHA512 af280e164b4b4a21d5d3cd489d8b2ff43e86fbf1d3896aabe9a8e3558b15549f4efc4497d99d6877b7d9547bf26a4a8ed422cbe00abbea73b2e936b30a71009f
-EBUILD data-binary-ieee754-0.4.4.ebuild 610 BLAKE2B 822b54c606c1038746b8a1ccf34a22559a21f2663945bdff726e21bf232cd76cf8abc97e7f37a17cd7c23e1dea60fca06ab46593d444d8ace7cf1ecb121e2f7c SHA512 913c339e51033ed919c6901830b01de4ed824565dae962805c1c47c9adbb9625233f664972f0ace7799484ecb96b725cd082797e40bbc3efca78ed326fa5b581
+EBUILD data-binary-ieee754-0.4.4.ebuild 571 BLAKE2B d164f96b6c866dc391a014014de35f6c54b4c2b817348a3199553000798788addf5ab2eb72cfded6a6176880b286db0a75a7a3f0455148b4b12274e28ab973ca SHA512 9c499a09cd5a137eb8d3889c810a6da265f98acc7b588b3275f7df0925914224e6847c20bf497cceed5ad1a0a00ca34dc83c4de460dbaae3c686744bb2a3cfcb
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild b/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild
index bf869183a40e..d4fb704a32a0 100644
--- a/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild
+++ b/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild
@@ -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.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,7 +17,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/data-default-instances-containers/Manifest b/dev-haskell/data-default-instances-containers/Manifest
index 6bafe6ad9250..e650681229f6 100644
--- a/dev-haskell/data-default-instances-containers/Manifest
+++ b/dev-haskell/data-default-instances-containers/Manifest
@@ -1,3 +1,3 @@
 DIST data-default-instances-containers-0.0.1.tar.gz 1659 BLAKE2B f422dc8c9d6d51a63019cc2c0edfe8216602fcecf97894cddd226ec3544fd5e469471a21cdafce39dfea835a475a332e80451c8c33549377fe2e73260f512e87 SHA512 a12352eb0484ad772b16674b2ef8145b3733473f716c182841d6378d8a2d3b196e8fc966afd7c335e81e924ea83088a9c67c4aaddb14a87a7a816cbe27236bfd
-EBUILD data-default-instances-containers-0.0.1.ebuild 654 BLAKE2B d73b34625c75e6ad161360d0f8cade74e70f58dd8afe562bf24ee24e0ce38b1a79514f61b29b767bd7308d7221a3cdb87e39b5cef7b6cca80ad5532bee798617 SHA512 da3e1ee14b4fd7197ced1e149c854f88be0a7b25a9f60177bb18a6f7960521a2a06c94243e12f03fe4c2f31793c1944e463fe596e6cc10624991cf446af4eea4
+EBUILD data-default-instances-containers-0.0.1.ebuild 653 BLAKE2B 3ec3081be9354670a2cfdb0aa0647d36cb5f0757180321df1dced97637f04679f474370b98ded03df13addaa37b5d5104c63bfa8f565ceb6b06e85b54a1c30fc SHA512 02cf2f08cc1b9d5e0e40b5b8b107d106735b479d413c1b5de9711f9f83b629df80a2800be33f9bb8e9acd9b4717c2f591a6abd1b9bdc15872954279eb7d4e4c1
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild b/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
index e4a2f8f9a1f0..bb40bc69477e 100644
--- a/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
+++ b/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
@@ -1,9 +1,9 @@
 # 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.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -18,6 +18,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
+	>=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/data-default-instances-dlist/Manifest b/dev-haskell/data-default-instances-dlist/Manifest
index a35585935070..0622f946c73d 100644
--- a/dev-haskell/data-default-instances-dlist/Manifest
+++ b/dev-haskell/data-default-instances-dlist/Manifest
@@ -1,3 +1,3 @@
 DIST data-default-instances-dlist-0.0.1.tar.gz 1503 BLAKE2B 672c6ad40c6174fe86176bb3af7fcf469fba942c3af32307babc2f2bdf477f5d3ff4b7361ffad01b1e475075434fdd6c9c4497f7ca6a036d5f5295bc61c03c0d SHA512 b3794c296d5f1ca54badaab4c267b302967ce73ac649d8df031daafa17f66537bf670ee42fda1b75b92998eb4b8862c1e0a9bdd3716c31dfd0937c3c76b6f03d
-EBUILD data-default-instances-dlist-0.0.1.ebuild 676 BLAKE2B 8a063456e7cc369a01b3d577536ace720bf4362ff305ccdea78f923374865415753a1a4a469f70845cd481aeb2daadb5c2d53fc5d48aee3b255e1e4292eb4151 SHA512 947eca25ed4caea0b3e060af1e9daa67b38937b776c9e57661f7a8ef39525c95b4e9dfd615a2d71a274936daf5e7a990e22a835a9feb8d991e8dc9f3f760b28e
+EBUILD data-default-instances-dlist-0.0.1.ebuild 674 BLAKE2B a1d3496bbc60ccaf91613429ea598d26703ead76222d5428d6ec66d47c6ba818fdf06bc2420bd50367a1849de479be22389ca36256eaadbe0a00b892515bb43b SHA512 f28ef92f60fbde5ff30147aafa6bb0737fe7dbe87aa84623201c092ef1ec77c081b04e9a338022ecc0a212992b62c2625eeb68a7d64b8ad8657e61934b6b6ede
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild b/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
index d22380bc7c60..6fbc7ae0ea60 100644
--- a/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
+++ b/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
@@ -1,9 +1,9 @@
 # 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.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -18,7 +18,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]
-		dev-haskell/dlist:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
+	dev-haskell/dlist:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/data-default-instances-old-locale/Manifest b/dev-haskell/data-default-instances-old-locale/Manifest
index b1488bc2cd96..02eef8f3023d 100644
--- a/dev-haskell/data-default-instances-old-locale/Manifest
+++ b/dev-haskell/data-default-instances-old-locale/Manifest
@@ -1,3 +1,3 @@
 DIST data-default-instances-old-locale-0.0.1.tar.gz 1519 BLAKE2B 4c2e28955f260bc4b2107449b1827216d2400f8bbf441e11a749f380300706007c363ede8ecd3dd84d31af7c9724e409129508f34195151a193e025b91b0a9d7 SHA512 bbaf4626c922820dca8cc230585fef80b6f6bd6278d335cc7abd4e5b7a857f0626ca9937ea95066e7655387dfcc684e6fbb0f6f5bc6905e539fbd1176ddd99ec
-EBUILD data-default-instances-old-locale-0.0.1.ebuild 689 BLAKE2B df03e7df2613d6403236162cea2e6206ea1f38cdcd055bbe8a8947a45d5397542c66916df52e9d60a874ddb8d012cf7b9267c082010dbba05455ca34ac9ed2bc SHA512 18b94d49282c625c31ce17a69366fcda356c1346049791501c88304293f80d466146dbb4d29a70d584698f6a9618d1fa94187675c162800c54a9904242e887d0
+EBUILD data-default-instances-old-locale-0.0.1.ebuild 689 BLAKE2B 3ff442ce17187357175ca9e9efadf00a47ebe7289b211061f443276888fd01c5615ff392a8703ca1ed92a86a983799415db1944b5c8c610ded6636294de938e5 SHA512 a0356436f5a1e2b8b6eee3207812386649479137027cb231bf70af5713b8c15417a36e614848ba7a3b406e13d063e9bcc2b81d585fd8d6b5c3ced2f7231f2261
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild b/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
index f07bbb601702..c10b95079d9d 100644
--- a/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
+++ b/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
@@ -1,9 +1,9 @@
 # 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.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/data-default/Manifest b/dev-haskell/data-default/Manifest
index b4c46c554aac..b7a22cd75e3a 100644
--- a/dev-haskell/data-default/Manifest
+++ b/dev-haskell/data-default/Manifest
@@ -1,3 +1,3 @@
-DIST data-default-0.5.3.tar.gz 1623 BLAKE2B 365de6448edfdaec1b852e89eb31faa323f0ab5f6fc101247f0a16d76680f98fea751c524fa3fe5b697c927eac3cf4c778a37eb5ff0fbcf0daf8bb3ab27f4220 SHA512 57cb632ccc6c9b0973594c7c5944574f4e7e78f980194d4205bb14a6e5aa1bd3e92723f3b80cfeac301ae663b2a22925503a03ecb5311ebc08077fe06022817e
-EBUILD data-default-0.5.3.ebuild 859 BLAKE2B 0700a5c0a9b4f5228abfea25424c59d6d801ea6055665c42345ef8916b39cb77e45fd7ded9015765eafc105da6e6d456d43e50db8b3938be42d0ee762d62f630 SHA512 4457ad0ae504857d92847d72614794863ea84ba1d81e9893fbdf2f2917e3e387c1dbfd1dbd818f79a8d8d5a6e6c0704f55c9583a53b1f515feabbdab3fc785de
+DIST data-default-0.7.1.1.tar.gz 1627 BLAKE2B 3d711bbc04c00c1918377d15fefaf394bf69ae877d828f00a17c20b08fa635a6be40582222a5973d2c56b96c81d89175af9f05f66ef3c12bddab29859bb09f88 SHA512 a31260c71178641e41f16fc504620f19ad04a44d2d095c96225b6027184c01ec0bf47effab5344816e438d7c37e34189255a9d3a5d643219b37054dde679d1bd
+EBUILD data-default-0.7.1.1.ebuild 811 BLAKE2B 121593e43c8c73f724de95ab4cebc49eadbba78a6d55b3df77286c709be237929e8f7c17d06cd0c0a57a189c07f163a154f0e49cc9e592ab9441a3278baef076 SHA512 29c001e47bb30d0049e8cd058042f6b6f7dd0d1580290f2377da3945ac7c1fb2284e689e5e04125cf2ce32c53e51774c5fd5099ce501e584cccd8233668c1ade
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/data-default/data-default-0.5.3.ebuild b/dev-haskell/data-default/data-default-0.7.1.1.ebuild
index 56020670cb80..290d9ff69506 100644
--- a/dev-haskell/data-default/data-default-0.5.3.ebuild
+++ b/dev-haskell/data-default/data-default-0.7.1.1.ebuild
@@ -1,9 +1,9 @@
 # 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.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,11 +17,12 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-RDEPEND="dev-haskell/data-default-class:=[profile?]
-		dev-haskell/data-default-instances-base:=[profile?]
-		dev-haskell/data-default-instances-containers:=[profile?]
-		dev-haskell/data-default-instances-dlist:=[profile?]
-		dev-haskell/data-default-instances-old-locale:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-haskell/data-default-class-0.1.2.0:=[profile?]
+	dev-haskell/data-default-instances-containers:=[profile?]
+	dev-haskell/data-default-instances-dlist:=[profile?]
+	dev-haskell/data-default-instances-old-locale:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/data-hash/Manifest b/dev-haskell/data-hash/Manifest
index f7648e35caec..d2bdfbdb299b 100644
--- a/dev-haskell/data-hash/Manifest
+++ b/dev-haskell/data-hash/Manifest
@@ -1,3 +1,3 @@
 DIST data-hash-0.2.0.1.tar.gz 8504 BLAKE2B e48e6be1e7074c415df85e1ff65311ad5cbd6e73b74bcea095e3d407f035b18c73370ea264cc4f617150f2c0aeb4a82619ac18e169ea2d4909f14570852b5bbb SHA512 daea098b9c808396606d90ae70e5156c492463db929b563a6195ee648ad72fc2949ab231ad67758fe0c68991826ea2292109a5d1f46d0cfc27c16e2e2b0666fa
-EBUILD data-hash-0.2.0.1.ebuild 671 BLAKE2B 2ad17df6349619eae833723d99d36246d4639f016c18ba527d90d2305e23d8e5519f8fd78258bf472fdab8082440fbe2d97535843efb57b60926963228af5174 SHA512 f822266983497e67c931e6bed1774d8e14da7104ebde7fe1f88a0fed0bf8f8f0c06a99e34bcbf122a0ce8737a1190812b337c4618ed8d9d5b100ab42e47c7e70
+EBUILD data-hash-0.2.0.1.ebuild 671 BLAKE2B d4039768b4607328ddd392430ca4267d6f574571df3ccc6bd69516d4a63649c6a6cad98b8c44f92ea4f3843ffa0b59b492354d859b0cb35a54b14ac904fc2c5b SHA512 26b56c72733f0785b901f3572b96938e6efc5aca202360351bc86befbb3885eab242f9b8750d51cc57d2e779572a3d0890d58d158b0aa5393db8c22ee18f7b8e
 MISC metadata.xml 399 BLAKE2B c9b872af09e7f0088341f6d309994a3706561a60358a4b524d9165bde7e6c6706605bac81a76d87bb0515fb65b71850ebff4060df6b69402ccc6ef3b3495efe0 SHA512 60a9f6b6891e077d6199265c53c19f604b9189e0142058cc756266d272b024a99c973f1b90c8c2c31a8d146e19faf9988c1c9c4b0dccd9389616d4971571859a
diff --git a/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild b/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild
index cb9557f7a1e5..0977eafb57c5 100644
--- a/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild
+++ b/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild
@@ -1,9 +1,9 @@
 # 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.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
diff --git a/dev-haskell/data-ordlist/Manifest b/dev-haskell/data-ordlist/Manifest
index a3fe954a4369..8daad5c53bd8 100644
--- a/dev-haskell/data-ordlist/Manifest
+++ b/dev-haskell/data-ordlist/Manifest
@@ -1,3 +1,3 @@
 DIST data-ordlist-0.4.7.0.tar.gz 8906 BLAKE2B 7bea3092bad04fb9defc7331e32dd997613dd4d43c5df82360c61831bec936eb03b178130f528eda59f2c5142ca579a76369afcab62638d4b037fe65a0fdde24 SHA512 a34ed99ea8eb34b29727a210f7a56c80b18a881e2da90fff0ae056b7c56b1f37212413a1daebc0b0118c193eb579d3d43bd426b25944da9044e8152eed80fa8b
-EBUILD data-ordlist-0.4.7.0.ebuild 575 BLAKE2B b0c9ae2bbf1d5065739e84e760a7cacde7ed01f1ccf821afda02515ea7d5a4ebfd0f5f6c5bbc7da1e3ba7dffa4eeef980006a5105dae354c50b746f87e69d82d SHA512 3ed212036d52e36d54746e7628ba0eaf0b448883be5e4c243757bc3cf1b9c8770073cd23181425dabf1ed5743846408ebedc27133dc4862a89960e7c1569fb59
+EBUILD data-ordlist-0.4.7.0.ebuild 575 BLAKE2B 35ce112941556f4e6fa4be5289754c05f62ba2736f0579d2360cad2dae79163d00c356958534dcdcef052a386fde6f42be76b0ee094b1888b934cad3419a2173 SHA512 abb78ec29489ab41604fc939629d7ef59dcbdaac392fe525840021b000bfc0a9a900e17dc2ecd1592758337db2a2b6a191e9728bd1ddc8619ac40842592ab8fb
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild b/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
index 5f08f8c4b4fb..afead2b93813 100644
--- a/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
+++ b/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
@@ -1,9 +1,9 @@
 # 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.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/dataenc/Manifest b/dev-haskell/dataenc/Manifest
index 2736ac7bf7d8..b09e67f6542c 100644
--- a/dev-haskell/dataenc/Manifest
+++ b/dev-haskell/dataenc/Manifest
@@ -1,3 +1,3 @@
 DIST dataenc-0.14.0.7.tar.gz 12813 BLAKE2B 3f213d73121c7973c706ad0d81d2e0153d7ac9cb242aa8d5b3bcd093dd8611d9476263a4893c43ce95aa642893d8b1b2ac2baf26d0f33c0fa3d64d7d0bb0722d SHA512 82f34ad51b64b66726e45c0c2ef52c9c2be201f42c5718763158a13eb2e8f82cb0298c1580dd52788e8d7b3f1eb0e7ade4e6e69f7ba4b2f8804eb2178e719e20
-EBUILD dataenc-0.14.0.7.ebuild 1136 BLAKE2B e87a82b79e2f0acc322c726f9553eba46ea61769743bbb5422ad47d0dea591623c2fee9a16ab89f4f7c51167c8eaca2ba514022a45557bea976916186bc7a959 SHA512 d81aeb60d64ced52b25cd70fbca94efd0f6673abc1f17506a4db81267163ac9730e6d89638bb7a4f4672ad8ba71618397fecde6d2769c9b083ab04ddb961ce29
+EBUILD dataenc-0.14.0.7.ebuild 1144 BLAKE2B 8a96bd6d48179b3ab14e078566eccec675f053798e1180e179741ae280be2d9ea211fec18aac1d605a541dcc9d96e770db352eb42f5918b0bf4a7baefe77b963 SHA512 372a528eb06d0861d0f349e1a0aefe953525e831a8830add09531110ac307c0c8c7c4f0ea97d34f1525165f3a4495767872f5c3a92033ebc156feac80bc2f4ee
 MISC metadata.xml 481 BLAKE2B 3692a18b12132405687d94af86493582c1a0080c549b0c29c8849861b42e42cf807ac37021cbbc59992d7065b469b6a88e6be916d61f11430d1f1a7523d7b3c1 SHA512 195d8c9c9c9080cf2f11c4535237ca3334d055018471dc9974a54c13e95362d79dde8fb556720e781a56ecfa2e5772a48ef45a7d0d270a29958777312768dbaa
diff --git a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
index 7bc5f390a18b..3a89b18c2688 100644
--- a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
+++ b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
@@ -1,11 +1,11 @@
 # 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.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Data encoding library"
@@ -31,6 +31,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	default
+
 	cabal_chdeps \
 		'base >= 3.0.0 && < 4.8' 'base >= 3.0.0' \
 		'QuickCheck ==2.5.*' 'QuickCheck >=2.5' \
diff --git a/dev-haskell/date-cache/Manifest b/dev-haskell/date-cache/Manifest
index 82182db42b69..364a2e994a42 100644
--- a/dev-haskell/date-cache/Manifest
+++ b/dev-haskell/date-cache/Manifest
@@ -1,3 +1,3 @@
 DIST date-cache-0.3.0.tar.gz 2126 BLAKE2B 51f0686bee8a72a0286c7ab03cc39346e4f4998ab0069a69586ae183fa8e9d9f4a707a5932bd3895d5fb7b895f206a643f097882a40a8127eb2a38bb49bbbefc SHA512 12e048dbd163929acf1b2e51eb81f83382dfbaee00f506a89c5477c0acccbcc29ec24c6d5d85340ea540430c2c1c4c62ad00d1f36196ae8a6fd3f9ae826f39be
-EBUILD date-cache-0.3.0-r1.ebuild 521 BLAKE2B 418d599c167478d60ef0400338e6723f6581ed62ccc840e559e42070a8278f59dbea89ef33dd11d3db21f5a726461e68ca83e5c9bd56368ef5a4c9d1717ead22 SHA512 da16db7fe5df5d314f6f0cbd232363c51f3401f94f16cd1a3620abd278e6792ab23bdaff6fbccfec5729091b3439a691552352b34f95235fb165e60f13d1364d
+EBUILD date-cache-0.3.0-r1.ebuild 521 BLAKE2B b97575b6704739b2393ef10e430fd13a32de475ce8bad5f5cc2bcca62d3f0e8b8c7ba2eaefe208be24ec8f2f9bc6f06d62002914eff9940e1300aa0a601a5917 SHA512 5c464b4c8259d83be1c6604b2aedede491a8d156359f7109ec19956e2d46e4cd663c157e0aa49626ba1baaef2d8b015ae0fd0b4b87b1cccf9a566794aacfdfd9
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild b/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild
index e0236bc18c74..5f0a6a09eddb 100644
--- a/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild
+++ b/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild
@@ -1,9 +1,9 @@
 # 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.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,6 +17,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
+	>=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/digest/Manifest b/dev-haskell/digest/Manifest
index 2a5872fc3e79..100ce7694f23 100644
--- a/dev-haskell/digest/Manifest
+++ b/dev-haskell/digest/Manifest
@@ -1,3 +1,3 @@
 DIST digest-0.0.1.2.tar.gz 3790 BLAKE2B 6fa19f1967dc6c8597d0ce2a1b29d3fecc8e47b0f652ca1319e4a7a10d3e9f8a299869ef43df2307f822568e04e109d946abe481aebd2decf8f72cafce4d6446 SHA512 f7961c098677c0e75561e3706446b073f60c6a8646aca6d139d6559952b2cba189221ac8af59f2dc6e4da65ee4a789f703e2ebbcf1e9c3df3f98167409bdf7c9
-EBUILD digest-0.0.1.2.ebuild 615 BLAKE2B 88e034db671c9972cf2dd0f418fe2aa03146aa0307075ca8d7090a36fcf2a414f7519e67f6d47df47d8ae95db690973074beb4a662b86474e11e7660122e1ad1 SHA512 5c141e77675c67db9f30eee232ccb6e8b4d025104262052663ac528a4ba8ab0971fb23931f784dcbf69e25a0bfc8f74e7490065eba1e9ffad661e39be447498e
-MISC metadata.xml 502 BLAKE2B 5e0e3d7246769ff38f7e8b191a133bddfcce9bb11ec8cf0359e83d10312d0417f1910e3b8d5a23d2cddec5a2cc0ae75e547fae2817275634b57303ea91b5d868 SHA512 167cc744a0303b3dff08214d9ce6fbf451120a8e1e6b286cca26b8dd6daa22803cf1e78294e7d5e177390bb3477f5e53acc43b06154ceb574735b3df88177b8b
+EBUILD digest-0.0.1.2.ebuild 616 BLAKE2B a91d070e009f098f66368210535bfb5ec218323fa17c25d1f4ad7b8575f63ae565ba39add41443567f68d7ada2e9ffbf2a3052dbfdc7315dd0504376762c10ed SHA512 95bf6285a28331be40759c2ca416168055b502dbcbc34380298bdc4d47135e9e16f1f7c97a54f57a60b9c277ebffd2090058894aead5539ffc1135ef31a35eeb
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/digest/digest-0.0.1.2.ebuild b/dev-haskell/digest/digest-0.0.1.2.ebuild
index b4c7d1999a00..45b7a198e8d7 100644
--- a/dev-haskell/digest/digest-0.0.1.2.ebuild
+++ b/dev-haskell/digest/digest-0.0.1.2.ebuild
@@ -1,9 +1,9 @@
 # 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.3.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,7 +17,9 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-		sys-libs/zlib"
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+	sys-libs/zlib
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/digest/metadata.xml b/dev-haskell/digest/metadata.xml
index 06e7bab845b7..b7878815d80d 100644
--- a/dev-haskell/digest/metadata.xml
+++ b/dev-haskell/digest/metadata.xml
@@ -5,9 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides efficient cryptographic hash implementations for
-		strict and lazy bytestrings. For now, CRC32 and Adler32 are supported;
-		they are implemented as FFI bindings to efficient code from zlib.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/disk-free-space/Manifest b/dev-haskell/disk-free-space/Manifest
index aa9eed6e8289..036f60ff045f 100644
--- a/dev-haskell/disk-free-space/Manifest
+++ b/dev-haskell/disk-free-space/Manifest
@@ -1,3 +1,3 @@
 DIST disk-free-space-0.1.0.1.tar.gz 2771 BLAKE2B 29c769acf9e60a88196197beb318cdab5b53583d979f7ab7fd9eda4e6252e991008b31f3f8d8cfcfd5f3ad46f7ebe90f55b8453d0666799dc04b31ba735783e2 SHA512 7e798e5428a8ee1a226c28172aca93940dae7aeec5f6fc0a7500da0299074a007f3b5a1d53d7282def245e4b829f86ff9f18ee1f8e824fa259052d5f2434729a
-EBUILD disk-free-space-0.1.0.1.ebuild 549 BLAKE2B 767ffd6506723da1f22b784256ca09325397691af9fdcc06b5ec8d6ae9f8d696317fe05af0e785c8c3ac01471f5a3a2407439d332e35678a8bcf6c00d397fc24 SHA512 7060a579e8c2a36963d0fc43c3e48adaf11dc8b6134a8035e88007dd73c11e9c258e0430e00cd264d4430c680b65ee2523873f68d2a8c2e1f0a17605949cd29f
+EBUILD disk-free-space-0.1.0.1.ebuild 549 BLAKE2B 6899e47e9df03bd683d804b1da7dc3e6bff75330937f7b559c99e7a89f8b3fa4a542eb8f1d1ab1c10689160df09aabd6ae9e68102d86b37ce846b04ec6ea42fe SHA512 f1f4eeb4156335a22696661fc0c0fc21d624c9c016cdd0755725e6b3b22351b367f5ca845084a5b018e0f56fce40a638a9bc223b191879fe38e1b3910c4a9b9a
 MISC metadata.xml 336 BLAKE2B b03196ae0472fab6bde7deb55f3ee9556c540b4865ad5041fb3c74b1d44fa2287224b2ba34ce8156811e1081979094d9281b69aa9a68e8f8f196e6416edb097a SHA512 76845985b59f3297652f67d91e9d19b57cb58e13c5b8d8532ad21f55ae14913a6dce271ef9f715830eadfc58e88a45effa59fa9172d74b151081b8d35e378be2
diff --git a/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild b/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild
index 9ec58982482f..1d0e064b63b4 100644
--- a/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild
+++ b/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild
@@ -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.7.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/djinn-ghc/Manifest b/dev-haskell/djinn-ghc/Manifest
index 713e6983fdda..59b1ae785d49 100644
--- a/dev-haskell/djinn-ghc/Manifest
+++ b/dev-haskell/djinn-ghc/Manifest
@@ -1,3 +1,3 @@
 DIST djinn-ghc-0.0.2.3.tar.gz 3330 BLAKE2B 87a8b2671805b84eca1e67cace7fe2bdb9e18886a873ccbb25bb1e64aae716dc00ab4e1235c5e81b60b41e52ea8f4988691cbc91893aa1054382f0d690b998f6 SHA512 441b6ce7f5d7e4672394bcc6654db9405406540e68855c41b7db33ef9e267178aa56f20209c4a91ffda59a7e44847c7bfebfa3f0c3df3d0868600f34912d9ae8
-EBUILD djinn-ghc-0.0.2.3.ebuild 715 BLAKE2B 68ebfd33fb5fa3ef0f0766109a226a06e4893c3f62e4fa127b7da1726cdd8da37dcb5628ac5baab19c238bc9e8c8baeeed09ec2c1d474085986619556fcf4640 SHA512 48f9252f239c9be74ff4a7d55db2ebef81ad7c7ead849051d08087cea609c2418c31e9aa34a3dbfa124935807b193727ee7e59dd03f2fa16550d85ba6506571a
-MISC metadata.xml 460 BLAKE2B 2b4283dc204fa5b7486e73264cc89fa7dd4fea7136ebd756576264dd2daf675b2195bb62ca8119fa3221575aa5740365348092588b7ae9b1be8bc2cf9ace1e64 SHA512 7720271056a73393862fa94e4e04ad52320c78357660c878631ca4f5513a54e8f9d28bd57a535f7dea589373b68958bda9e3351c6bfe72d3257d7a2adab0e391
+EBUILD djinn-ghc-0.0.2.3.ebuild 682 BLAKE2B e0b789022c3b533ff6687786386d65e2381521498f255e3ac5604913768dd24253f1e4ab4dbfb50ec8636ccc5e376de006ba5f7bd6d8d08cf1cc2db944e54cd8 SHA512 2b827ad819972be95586f48881c5de36aeb5f4c3274125a28d39a9d3a005ce4c26448501bb4e346ac1ed80a71a50a6739d92ae1aca6e204e8db2acc6df012f2d
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild b/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild
index e31f460a78d0..2af6d2945e1d 100644
--- a/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild
+++ b/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild
@@ -1,9 +1,9 @@
 # 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.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -20,9 +20,8 @@ IUSE=""
 RDEPEND="dev-haskell/async:=[profile?]
 	>=dev-haskell/djinn-lib-0.0.1.2:=[profile?]
 	dev-haskell/mtl:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-1.18.1.3
 "
diff --git a/dev-haskell/djinn-ghc/metadata.xml b/dev-haskell/djinn-ghc/metadata.xml
index 927e4b37372f..b7878815d80d 100644
--- a/dev-haskell/djinn-ghc/metadata.xml
+++ b/dev-haskell/djinn-ghc/metadata.xml
@@ -5,9 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Djinn uses an theorem prover for intuitionistic propositional logic
-		to generate a Haskell expression when given a type.
-		This is the bridge from djinn-lib to GHC API.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/drbg/Manifest b/dev-haskell/drbg/Manifest
index aad2dea89c04..c5eded8f3f0a 100644
--- a/dev-haskell/drbg/Manifest
+++ b/dev-haskell/drbg/Manifest
@@ -1,3 +1,3 @@
 DIST DRBG-0.5.5.tar.gz 1547022 BLAKE2B ca70a605334a60a0c4fcb1bf55c5e2f30065e55387372bfe0068b4ffa69e79607432b5eeef395126c00801e45a39a34b94c96e526357c8bec6fce077484c1c15 SHA512 e71fc158a7961729ce10d2ca795a935d6a103f31e864f0446cc4faf2b0edb3a5938a4cc79135cf043a375e63f9be4401ce092951b4e8f47c1c3b1c2070c118be
-EBUILD drbg-0.5.5.ebuild 1369 BLAKE2B 659d016cdc6334059597f7dad289f40275fde42e0f4df7dbbfaa87b22dbac737f55372ab88ffc72d99440a42738bffea23d52865f66f98c22dfe12db344fa410 SHA512 acc9e72f340f1ebbeb9820cb675ac05737166e00a80756ab4c51340aa0729de636bc8eeab0df328bdb86af48a4186246c74e8a8a258d0c7e1c1a31f8e930cec9
+EBUILD drbg-0.5.5.ebuild 1348 BLAKE2B b9ddf97c052e2d1cb2d2806ecb1ebb2a8c84d566cda3e020812cb2f4cc0cba8906b8c0a685cbd211ee868ae123e11a71210d6ff39b71d4bfc95265b08dbee82e SHA512 02320d132a45a22c1917afa592851525c2114b706edb22dcd6b7497aafa2a994c84352f49f7dc1c2e86377d13b6d97508ae1202c8021704c6a62d9eb3ef00a18
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/drbg/drbg-0.5.5.ebuild b/dev-haskell/drbg/drbg-0.5.5.ebuild
index 9437a37de532..092def8c5f83 100644
--- a/dev-haskell/drbg/drbg-0.5.5.ebuild
+++ b/dev-haskell/drbg/drbg-0.5.5.ebuild
@@ -1,9 +1,9 @@
 # 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.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -35,8 +35,7 @@ RDEPEND=">=dev-haskell/cereal-0.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/binary
-		dev-haskell/crypto-api-tests
+	test? ( dev-haskell/crypto-api-tests
 		dev-haskell/hunit
 		dev-haskell/quickcheck
 		dev-haskell/test-framework
diff --git a/dev-haskell/easy-file/Manifest b/dev-haskell/easy-file/Manifest
index 986fe9d168c4..2ca3a5eb305c 100644
--- a/dev-haskell/easy-file/Manifest
+++ b/dev-haskell/easy-file/Manifest
@@ -1,3 +1,3 @@
-DIST easy-file-0.2.1.tar.gz 12610 BLAKE2B c2b1420563fb4070d927631f51119849d48f6e680506f2df3b84572729819311f3ba8eca3d25110a30f245a61da93edfc53de508411baeeccaf9eae94165bdc1 SHA512 48249b2662384cd766d8a7f66242c1d4c68b5b56a87583fd0363cd075c7fc0d8f013edb45fcab15ceaa8325e4f2fbb6ed920ca873e231c44934d6dae12e6102f
-EBUILD easy-file-0.2.1.ebuild 534 BLAKE2B 2b5668707148ff7c86c3a6642331ec8d6725400ca1f292004570b86df0e595a9aebeaeb13ce2e4ada90bd5ef4fa2734005d4395b0f66189b8b52dd2150619a43 SHA512 44b4bc50566d1b32751e856f091c05a2b9440ae379d1f3efe2c91b047fab684c0aff678e292b7fc793412b3e8fe076c4a1969f1304540c9763f8ea88fe1477a2
-MISC metadata.xml 337 BLAKE2B af91268a2068243974cce885ce4558991080808d59e61528bcf596b925e2eb83cdcef9e0516642a7ba21dd13b6246610e10e2d0c0ed63dbc6acdd03dfefa19bd SHA512 b95c62ae962fbe2e3b0bf32cf8e83a9d54eaee34264b903824ac5d5be0efd4dff1a0840d101d330c613054ef012dc5938c2e7ea8a76b0dec5fb999b23d794246
+DIST easy-file-0.2.2.tar.gz 12667 BLAKE2B 4f018144e10abe237e03bcf73189dfc0fcdb39afe62ca269c398baf9a4d9e10c2f1409307f331b99ca3c51f3b23bfccef6bca823016de01c9a1731bbd295a48f SHA512 12a11afe54175b21382786b9d7aae59ba068a27857a3ceb934023da7d14a5e9a69e4b4210a97b5e64fbcd6a41251a6a8b5608feb8a3bb212077b08148468576e
+EBUILD easy-file-0.2.2.ebuild 534 BLAKE2B 6adc7698031b33ecfe32c5bd1d29b8d0ac0a19d855578b1d719dee6e848bbe480dcfd880305851e4022669f1691aed94dece1ebebb1154d26da785ad2e25074d SHA512 1f3206db6ec03cb1c0a26465e9595cfc137a39a1a80d51f6be2f77849744bda623273fedb5ebb931c18c52d02c83d708e0a3df854368b153d8cd53c4ce042f01
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/easy-file/easy-file-0.2.1.ebuild b/dev-haskell/easy-file/easy-file-0.2.2.ebuild
index 63d0588abd8b..e396dc548411 100644
--- a/dev-haskell/easy-file/easy-file-0.2.1.ebuild
+++ b/dev-haskell/easy-file/easy-file-0.2.2.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.5.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/easy-file/metadata.xml b/dev-haskell/easy-file/metadata.xml
index 41c1d03a82ab..b7878815d80d 100644
--- a/dev-haskell/easy-file/metadata.xml
+++ b/dev-haskell/easy-file/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">kazu-yamamoto/easy-file</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/edisoncore/Manifest b/dev-haskell/edisoncore/Manifest
index f169665395df..3335956681b6 100644
--- a/dev-haskell/edisoncore/Manifest
+++ b/dev-haskell/edisoncore/Manifest
@@ -1,6 +1,4 @@
-AUX edisoncore-1.3.2.1-ghc-8.8.patch 57508 BLAKE2B 0651b4be26461cfe2bd3a57742ee138863ec6b47940065754642bd6320d814dfc8cb63bd4b37131bb3135752d03cdab335c2f1ebf5ccd87bd9219bd39d43c3e3 SHA512 9e5b60ec6023f2be4af4ecae0fcf00f8b6f758ea6bbd21c3dea4d3dd9ff128736e743e9a020a445e27e4ff1fb6c43061427f042353fe84528f2d715b5784302b
-DIST EdisonCore-1.3.1.1.tar.gz 80699 BLAKE2B e92848bb282d478c84817e0c0c2515b0fcb227b8224b020e8e50df4deb53915ccb7aa172a86eef787aa985efaaffbb42deab0fbb5b8669adf9635129b017fee8 SHA512 2e290a5c792a136931387936f457a45913edeedb9eda8006649b974d9aea294b9f1b7e5b2aa020c3ed151934cef8b2bd228e2cb56f7db37f35d59dcb23f7bcb8
 DIST EdisonCore-1.3.2.1.tar.gz 82522 BLAKE2B 758e02e462d4f86b95a66792ce26dda6d1a00506a8071f3716f9a7484fc992af9e1709a9bbb958ee71175b2c51c4574493a35b6eaa7a1bfab415ed4ce7e2a8b4 SHA512 6812b04edb1abdfc2486d66bb86d6370b76667de1603ab421d92a6ecc17a25014e0ab97f53dd4f1e75cacf32c31611e8f2dd6c740c840e349c3c762ae00df65f
-EBUILD edisoncore-1.3.1.1.ebuild 846 BLAKE2B 4e7926cd4ac89d36681068a4ab4d85ff328825f6e4c72b5e88f91a81ca4bd616a17412e81ce5d237cba8a08075074960baeb6d2a3e4f4abb1c7952435acfceda SHA512 30077a71ea972ec3ad9d42a4fe9ca922a421af50c305bda94367502492b9b18f554a18a97ede76a44c9d15d7e4bf1d0243a7f470c61944bbb2c32875af4e22a9
-EBUILD edisoncore-1.3.2.1-r1.ebuild 985 BLAKE2B b83c04eea598842e812aa02a96379a2cde60983c9ffc2a09ffdc68018db0e66efe1c6b79c36db50f710ffb95db57341af4b818acf2b7cb07cc43309f524c43cc SHA512 f3507b57ebac7f9ae6bdcc141481f8a1e245d2a03b0cd7a9d5d12902730f0da8b3cdfaa6973bcf6f5252006652a47bd3f5e94b6f02d3f7ac870bfb220681c61c
+DIST edisoncore-1.3.2.1-ghc-8.8.patch 57508 BLAKE2B 0651b4be26461cfe2bd3a57742ee138863ec6b47940065754642bd6320d814dfc8cb63bd4b37131bb3135752d03cdab335c2f1ebf5ccd87bd9219bd39d43c3e3 SHA512 9e5b60ec6023f2be4af4ecae0fcf00f8b6f758ea6bbd21c3dea4d3dd9ff128736e743e9a020a445e27e4ff1fb6c43061427f042353fe84528f2d715b5784302b
+EBUILD edisoncore-1.3.2.1-r1.ebuild 1062 BLAKE2B 528e9ff75dc24cd532f473271b92c02f8251b01d0ba5e6dfdaa65ef9c00288677afa15617ba977b3d93f6fd5c5d8b0c57b3d0c2fcbc5c177e589f6a049406b44 SHA512 5d0deb39b003252d926f3342763bdc16da21c423ef6ef015a5a2653331c783cada3f47088ab5b825ccd37efcd7ff3c250ae0991540fba347b0174415590ec6ef
 MISC metadata.xml 604 BLAKE2B 470c5efc02f3d04ba57508b958cfcf4b5cceb00ae59e98b8d35d29eadcca522529f56a4a2f6b0d14424fee9c9fad879f719547557cab168508bf4eb862d5aab9 SHA512 025104263582c6b0f1c6c1016ca8b64094bfffae4c6778996da351bd8febcbe705227cb5eeb516f59211fecf0b1edac6f77eb2dffc2654175952621d678195e4
diff --git a/dev-haskell/edisoncore/edisoncore-1.3.1.1.ebuild b/dev-haskell/edisoncore/edisoncore-1.3.1.1.ebuild
deleted file mode 100644
index 7f38c6d65f14..000000000000
--- a/dev-haskell/edisoncore/edisoncore-1.3.1.1.ebuild
+++ /dev/null
@@ -1,32 +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"
-inherit haskell-cabal
-
-MY_PN="EdisonCore"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library of efficent, purely-functional data structures (Core Implementations)"
-HOMEPAGE="http://rwd.rdockins.name/edison/home/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/edisonapi-1.3:=[profile?] <dev-haskell/edisonapi-1.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/quickcheck-2.8.2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild b/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild
index 87a59c476f7a..c2550f9bba98 100644
--- a/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild
+++ b/dev-haskell/edisoncore/edisoncore-1.3.2.1-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
@@ -13,7 +13,10 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A library of efficent, purely-functional data structures (Core Implementations)"
 HOMEPAGE="http://rwd.rdockins.name/edison/home/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+SRC_URI="
+	https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~slyfox/distfiles/edisoncore-1.3.2.1-ghc-8.8.patch
+"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
@@ -32,4 +35,4 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${PN}-1.3.2.1-ghc-8.8.patch" )
+PATCHES=( "${DISTDIR}/${PN}-1.3.2.1-ghc-8.8.patch" )
diff --git a/dev-haskell/edisoncore/files/edisoncore-1.3.2.1-ghc-8.8.patch b/dev-haskell/edisoncore/files/edisoncore-1.3.2.1-ghc-8.8.patch
deleted file mode 100644
index 5589433edc69..000000000000
--- a/dev-haskell/edisoncore/files/edisoncore-1.3.2.1-ghc-8.8.patch
+++ /dev/null
@@ -1,1268 +0,0 @@
-diff --git a/EdisonCore.cabal b/EdisonCore.cabal
-index 901cd83..ad1af00 100644
---- a/EdisonCore.cabal
-+++ b/EdisonCore.cabal
-@@ -62,8 +62,10 @@ Library
-      array
- 
-   if impl(ghc < 8.0)
--    -- Provide/emulate Data.Semigroups` API for pre-GHC-8
--    Build-Depends: semigroups == 0.18.*
-+    Build-Depends:
-+      fail,
-+      -- Provide/emulate Data.Semigroups` API for pre-GHC-8
-+      semigroups == 0.18.*
- 
-   Default-Language: Haskell2010
-   Default-Extensions:
-diff --git a/src/Data/Edison/Assoc/AssocList.hs b/src/Data/Edison/Assoc/AssocList.hs
-index c577492..15d9884 100644
---- a/src/Data/Edison/Assoc/AssocList.hs
-+++ b/src/Data/Edison/Assoc/AssocList.hs
-@@ -58,8 +58,9 @@ import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
- import qualified Prelude
- import Data.Monoid
- import Data.Semigroup as SG
--import Control.Monad.Identity
-+import qualified Control.Monad.Fail as Fail
- import qualified Data.Edison.Assoc as A
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.Edison.Seq as S
- import qualified Data.Edison.Seq.BinaryRandList as RL
- import Data.Edison.Assoc.Defaults
-@@ -82,10 +83,10 @@ size          :: Eq k => FM k a -> Int
- member        :: Eq k => k -> FM k a -> Bool
- count         :: Eq k => k -> FM k a -> Int
- lookup        :: Eq k => k -> FM k a -> a
--lookupM       :: (Eq k, Monad rm) => k -> FM k a -> rm a
-+lookupM       :: (Eq k, Fail.MonadFail rm) => k -> FM k a -> rm a
- lookupAll     :: (Eq k,S.Sequence seq) => k -> FM k a -> seq a
- lookupAndDelete    :: Eq k => k -> FM k a -> (a,FM k a)
--lookupAndDeleteM   :: (Eq k,Monad rm)   => k -> FM k a -> rm (a,FM k a)
-+lookupAndDeleteM   :: (Eq k, Fail.MonadFail rm)   => k -> FM k a -> rm (a,FM k a)
- lookupAndDeleteAll :: (Eq k,S.Sequence seq) => k -> FM k a -> (seq a,FM k a)
- lookupWithDefault  :: Eq k => a -> k -> FM k a -> a
- adjust             :: Eq k => (a -> a) -> k -> FM k a -> FM k a
-@@ -143,11 +144,11 @@ unionSeqWithKey  :: (Eq k,S.Sequence seq) =>
-                         (k -> a -> a -> a) -> seq (FM k a) -> FM k a
- intersectionWithKey :: Eq k => (k -> a -> b -> c) -> FM k a -> FM k b -> FM k c
- 
--minView          :: (Ord k,Monad m) => FM k a -> m (a,FM k a)
-+minView          :: (Ord k, Fail.MonadFail m) => FM k a -> m (a,FM k a)
- minElem          :: Ord k => FM k a -> a
- deleteMin        :: Ord k => FM k a -> FM k a
- unsafeInsertMin  :: Ord k => k -> a -> FM k a -> FM k a
--maxView          :: (Ord k,Monad m) => FM k a -> m (a,FM k a)
-+maxView          :: (Ord k, Fail.MonadFail m) => FM k a -> m (a,FM k a)
- maxElem          :: Ord k => FM k a -> a
- deleteMax        :: Ord k => FM k a -> FM k a
- unsafeInsertMax  :: Ord k => k -> a -> FM k a -> FM k a
-@@ -169,9 +170,9 @@ partitionLT_GE   :: Ord k => k -> FM k a -> (FM k a,FM k a)
- partitionLE_GT   :: Ord k => k -> FM k a -> (FM k a,FM k a)
- partitionLT_GT   :: Ord k => k -> FM k a -> (FM k a,FM k a)
- 
--minViewWithKey    :: (Ord k,Monad m) => FM k a -> m ((k, a), FM k a)
-+minViewWithKey    :: (Ord k, Fail.MonadFail m) => FM k a -> m ((k, a), FM k a)
- minElemWithKey    :: Ord k => FM k a -> (k,a)
--maxViewWithKey    :: (Ord k,Monad m) => FM k a -> m ((k, a), FM k a)
-+maxViewWithKey    :: (Ord k, Fail.MonadFail m) => FM k a -> m ((k, a), FM k a)
- maxElemWithKey    :: Ord k => FM k a -> (k,a)
- foldrWithKey      :: Ord k => (k -> a -> b -> b) -> b -> FM k a -> b
- foldlWithKey      :: Ord k => (b -> k -> a -> b) -> b -> FM k a -> b
-@@ -309,7 +310,7 @@ count _ E = 0
- count key (I k _ m) | key == k  = 1
-                     | otherwise = count key m
- 
--lookup key m = runIdentity (lookupM key m)
-+lookup key m = runFail_ (lookupM key m)
- 
- lookupM _ E = fail "AssocList.lookup: lookup failed"
- lookupM key (I k x m) | key == k  = return x
-@@ -319,7 +320,7 @@ lookupAll _ E = S.empty
- lookupAll key (I k x m) | key == k  = S.singleton x
-                         | otherwise = lookupAll key m
- 
--lookupAndDelete key m = runIdentity (lookupAndDeleteM key m)
-+lookupAndDelete key m = runFail_ (lookupAndDeleteM key m)
- 
- lookupAndDeleteM _ E = fail "AssocList.lookupAndDeleteM: lookup failed"
- lookupAndDeleteM key (I k x m)
-diff --git a/src/Data/Edison/Assoc/Defaults.hs b/src/Data/Edison/Assoc/Defaults.hs
-index a9ef520..8e2b37d 100644
---- a/src/Data/Edison/Assoc/Defaults.hs
-+++ b/src/Data/Edison/Assoc/Defaults.hs
-@@ -15,6 +15,8 @@ module Data.Edison.Assoc.Defaults where
- 
- import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
- 
-+import qualified Control.Monad.Fail as Fail
-+
- import Data.Edison.Assoc
- import qualified Data.Edison.Seq as S
- import qualified Data.Edison.Seq.ListSeq as L
-@@ -190,7 +192,7 @@ lookupAndDeleteDefault k m =
-      Nothing -> error (instanceName m ++ ".lookupAndDelete: lookup failed")
-      Just x  -> (x, delete k m)
- 
--lookupAndDeleteMDefault :: (Monad rm, AssocX m k) => k -> m a -> rm (a, m a)
-+lookupAndDeleteMDefault :: (Fail.MonadFail rm, AssocX m k) => k -> m a -> rm (a, m a)
- lookupAndDeleteMDefault k m =
-   case lookupM k m of
-      Nothing -> fail (instanceName m ++ ".lookupAndDelete: lookup failed")
-diff --git a/src/Data/Edison/Assoc/PatriciaLoMap.hs b/src/Data/Edison/Assoc/PatriciaLoMap.hs
-index 3073f83..43c2d85 100644
---- a/src/Data/Edison/Assoc/PatriciaLoMap.hs
-+++ b/src/Data/Edison/Assoc/PatriciaLoMap.hs
-@@ -55,10 +55,11 @@ module Data.Edison.Assoc.PatriciaLoMap (
- 
- import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
- import qualified Prelude
--import Control.Monad.Identity (runIdentity)
-+import qualified Control.Monad.Fail as Fail
- import Data.Monoid
- import Data.Semigroup as SG
- import qualified Data.Edison.Assoc as A
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.Edison.Seq as S
- import qualified Data.Edison.Seq.ListSeq as L
- import Data.Edison.Assoc.Defaults
-@@ -210,9 +211,9 @@ member k (L j _) = (j == k)
- member k (B _ m t0 t1) = if zeroBit k m then member k t0 else member k t1
- 
- lookup :: Int -> FM a -> a
--lookup k m = runIdentity (lookupM k m)
-+lookup k m = runFail_ (lookupM k m)
- 
--lookupM :: (Monad rm) => Int -> FM a -> rm a
-+lookupM :: (Fail.MonadFail rm) => Int -> FM a -> rm a
- lookupM _ E = fail "PatriciaLoMap.lookup: lookup failed"
- lookupM k (L j x)
-   | j == k    = return x
-@@ -233,7 +234,7 @@ lookupAndDelete        = doLookupAndDelete
-                            (error "PatriciaLoMap.lookupAndDelete: lookup failed")
-                            (,)
- 
--lookupAndDeleteM :: Monad m => Int -> FM a -> m (a, FM a)
-+lookupAndDeleteM :: Fail.MonadFail m => Int -> FM a -> m (a, FM a)
- lookupAndDeleteM       = doLookupAndDelete
-                            (fail "PatriciaLoMap.lookupAndDelete: lookup failed")
-                            (\x m -> return (x,m))
-@@ -583,25 +584,25 @@ ordListFM_rev (B _ _ t0 t1) = merge (ordListFM_rev t0) (ordListFM_rev t1)
-             GT -> x : merge xs (y:ys)
-             EQ -> error "PatriciaLoMap: bug in ordListFM_rev"
- 
--minView :: Monad m => FM a -> m (a, FM a)
-+minView :: Fail.MonadFail m => FM a -> m (a, FM a)
- minView fm =
-    case ordListFM fm of
-      [] -> fail $ moduleName++".minView: empty map"
-      ((k,x):_) -> return (x,delete k fm)
- 
--minViewWithKey :: Monad m => FM a -> m ((Int, a), FM a)
-+minViewWithKey :: Fail.MonadFail m => FM a -> m ((Int, a), FM a)
- minViewWithKey fm =
-    case ordListFM fm of
-      [] -> fail $ moduleName++".minViewWithKey: empty map"
-      ((k,x):_) -> return ((k,x),delete k fm)
- 
--maxView :: Monad m => FM a -> m (a, FM a)
-+maxView :: Fail.MonadFail m => FM a -> m (a, FM a)
- maxView fm =
-   case ordListFM_rev fm of
-      [] -> fail $ moduleName++".maxView: empty map"
-      ((k,x):_) -> return (x,delete k fm)
- 
--maxViewWithKey :: Monad m => FM a -> m ((Int, a), FM a)
-+maxViewWithKey :: Fail.MonadFail m => FM a -> m ((Int, a), FM a)
- maxViewWithKey fm =
-    case ordListFM_rev fm of
-      [] -> fail $ moduleName++".maxViewWithKey: empty map"
-diff --git a/src/Data/Edison/Assoc/StandardMap.hs b/src/Data/Edison/Assoc/StandardMap.hs
-index 5ca48c5..e7b6a0e 100644
---- a/src/Data/Edison/Assoc/StandardMap.hs
-+++ b/src/Data/Edison/Assoc/StandardMap.hs
-@@ -51,6 +51,7 @@ module Data.Edison.Assoc.StandardMap (
- 
- import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
- import qualified Prelude
-+import qualified Control.Monad.Fail as Fail
- import qualified Data.Edison.Assoc as A
- import qualified Data.Edison.Seq as S
- import qualified Data.Edison.Seq.ListSeq as L
-@@ -81,10 +82,10 @@ member            :: Ord k => k -> FM k a -> Bool
- count             :: Ord k => k -> FM k a -> Int
- lookup            :: Ord k => k -> FM k a -> a
- lookupAll         :: (Ord k,S.Sequence seq) => k -> FM k a -> seq a
--lookupM           :: (Ord k,Monad m) => k -> FM k a -> m a
-+lookupM           :: (Ord k, Fail.MonadFail m) => k -> FM k a -> m a
- lookupWithDefault :: Ord k => a -> k -> FM k a -> a
- lookupAndDelete   :: Ord k => k -> FM k a -> (a, FM k a)
--lookupAndDeleteM  :: (Ord k,Monad m) => k -> FM k a -> m (a, FM k a)
-+lookupAndDeleteM  :: (Ord k, Fail.MonadFail m) => k -> FM k a -> m (a, FM k a)
- lookupAndDeleteAll :: (Ord k,S.Sequence seq) => k -> FM k a -> (seq a,FM k a)
- adjust            :: Ord k => (a->a) -> k -> FM k a -> FM k a
- adjustAll         :: Ord k => (a->a) -> k -> FM k a -> FM k a
-@@ -103,11 +104,11 @@ filter            :: Ord k => (a -> Bool) -> FM k a -> FM k a
- partition         :: Ord k => (a -> Bool) -> FM k a -> (FM k a,FM k a)
- elements          :: (Ord k,S.Sequence seq) => FM k a -> seq a
- 
--minView           :: (Ord k,Monad m) => FM k a -> m (a, FM k a)
-+minView           :: (Ord k, Fail.MonadFail m) => FM k a -> m (a, FM k a)
- minElem           :: Ord k => FM k a -> a
- deleteMin         :: Ord k => FM k a -> FM k a
- unsafeInsertMin   :: Ord k => k -> a -> FM k a -> FM k a
--maxView           :: (Ord k,Monad m) => FM k a -> m (a, FM k a)
-+maxView           :: (Ord k, Fail.MonadFail m) => FM k a -> m (a, FM k a)
- maxElem           :: Ord k => FM k a -> a
- deleteMax         :: Ord k => FM k a -> FM k a
- unsafeInsertMax   :: Ord k => k -> a -> FM k a -> FM k a
-@@ -165,9 +166,9 @@ foldWithKey'      :: Ord k => (k -> a -> b -> b) -> b -> FM k a -> b
- filterWithKey     :: Ord k => (k -> a -> Bool) -> FM k a -> FM k a
- partitionWithKey  :: Ord k => (k -> a -> Bool) -> FM k a -> (FM k a,FM k a)
- 
--minViewWithKey    :: (Ord k,Monad m) => FM k a -> m ((k, a), FM k a)
-+minViewWithKey    :: (Ord k, Fail.MonadFail m) => FM k a -> m ((k, a), FM k a)
- minElemWithKey    :: Ord k => FM k a -> (k,a)
--maxViewWithKey    :: (Ord k,Monad m) => FM k a -> m ((k, a), FM k a)
-+maxViewWithKey    :: (Ord k, Fail.MonadFail m) => FM k a -> m ((k, a), FM k a)
- maxElemWithKey    :: Ord k => FM k a -> (k,a)
- foldrWithKey      :: (k -> a -> b -> b) -> b -> FM k a -> b
- foldlWithKey      :: (b -> k -> a -> b) -> b -> FM k a -> b
-diff --git a/src/Data/Edison/Assoc/TernaryTrie.hs b/src/Data/Edison/Assoc/TernaryTrie.hs
-index 8b2dd57..431b348 100644
---- a/src/Data/Edison/Assoc/TernaryTrie.hs
-+++ b/src/Data/Edison/Assoc/TernaryTrie.hs
-@@ -55,8 +55,10 @@ module Data.Edison.Assoc.TernaryTrie (
- import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
- import qualified Prelude
- import qualified Data.Edison.Assoc as A
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.Edison.Seq as S
- import qualified Data.List as L
-+import qualified Control.Monad.Fail as Fail
- import Control.Monad.Identity
- import Data.Monoid
- import Data.Semigroup as SG
-@@ -83,10 +85,10 @@ size          :: Ord k => FM k a -> Int
- member        :: Ord k => [k] -> FM k a -> Bool
- count         :: Ord k => [k] -> FM k a -> Int
- lookup        :: Ord k => [k] -> FM k a -> a
--lookupM       :: (Ord k, Monad rm) => [k] -> FM k a -> rm a
-+lookupM       :: (Ord k, Fail.MonadFail rm) => [k] -> FM k a -> rm a
- lookupAll     :: (Ord k,S.Sequence seq) => [k] -> FM k a -> seq a
- lookupAndDelete    :: Ord k => [k] -> FM k a -> (a, FM k a)
--lookupAndDeleteM   :: (Ord k, Monad rm) => [k] -> FM k a -> rm (a, FM k a)
-+lookupAndDeleteM   :: (Ord k, Fail.MonadFail rm) => [k] -> FM k a -> rm (a, FM k a)
- lookupAndDeleteAll :: (Ord k, S.Sequence seq) => [k] -> FM k a -> (seq a,FM k a)
- lookupWithDefault  :: Ord k => a -> [k] -> FM k a -> a
- adjust        :: Ord k => (a -> a) -> [k] -> FM k a -> FM k a
-@@ -527,7 +529,7 @@ member = memberUsingLookupM
- 
- count = countUsingMember
- 
--lookup m k = runIdentity (lookupM m k)
-+lookup m k = runFail_ (lookupM m k)
- 
- lookupM [] (FM Nothing _)
-   = fail "TernaryTrie.lookup: lookup failed"
-@@ -854,18 +856,18 @@ intersectionWithKey f
- 
- -- OrdAssocX
- 
--minViewFMB :: Monad m => FMB k a -> (FMB k a -> FM k a) -> m (a, FM k a)
-+minViewFMB :: Fail.MonadFail m => FMB k a -> (FMB k a -> FM k a) -> m (a, FM k a)
- minViewFMB E _ = fail $ moduleName++".minView: empty map"
- minViewFMB (I i k (Just v) E m r)        f = return (v, f (I i k Nothing E m r))
- minViewFMB (I _ _ Nothing  E (FMB' E) _) _ = error $ moduleName++".minView: bug!"
- minViewFMB (I _ k Nothing  E (FMB' m) r) f = minViewFMB m (\m' -> f (mkVBalancedFMB k Nothing E (FMB' m') r))
- minViewFMB (I _ k mv l m r)              f = minViewFMB l (\l' -> f (mkVBalancedFMB k mv l' m r))
- 
--minView :: Monad m => FM k a -> m (a,FM k a)
-+minView :: Fail.MonadFail m => FM k a -> m (a,FM k a)
- minView (FM (Just v) fmb) = return (v, FM Nothing fmb)
- minView (FM Nothing fmb)  = minViewFMB fmb (FM Nothing)
- 
--minViewWithKeyFMB :: Monad m => FMB k a -> ([k] -> [k]) -> (FMB k a -> FM k a) -> m (([k],a),FM k a)
-+minViewWithKeyFMB :: Fail.MonadFail m => FMB k a -> ([k] -> [k]) -> (FMB k a -> FM k a) -> m (([k],a),FM k a)
- minViewWithKeyFMB E _ _ = fail $ moduleName++".minView: empty map"
- minViewWithKeyFMB (I i k (Just v) E m r)        kf f = return ((kf [k],v),f (I i k Nothing E m r))
- minViewWithKeyFMB (I _ _ Nothing  E (FMB' E) _) _ _ = error $ moduleName++".minViewWithKey: bug!"
-@@ -874,7 +876,7 @@ minViewWithKeyFMB (I _ k Nothing  E (FMB' m) r) kf f = minViewWithKeyFMB m (kf .
- minViewWithKeyFMB (I _ k mv l m r)              kf f = minViewWithKeyFMB l kf
-                                                         (\l' -> f (mkVBalancedFMB k mv l' m r))
- 
--minViewWithKey :: Monad m => FM k a -> m (([k],a),FM k a)
-+minViewWithKey :: Fail.MonadFail m => FM k a -> m (([k],a),FM k a)
- minViewWithKey (FM (Just v) fmb) = return (([],v),FM Nothing fmb)
- minViewWithKey (FM Nothing fmb)  = minViewWithKeyFMB fmb id (FM Nothing)
- 
-@@ -906,7 +908,7 @@ deleteMin = deleteMinUsingMinView
- unsafeInsertMin :: Ord k => [k] -> a -> FM k a -> FM k a
- unsafeInsertMin = insert
- 
--maxViewFMB :: Monad m => FMB k a -> (FMB k a -> FM k a) -> m (a, FM k a)
-+maxViewFMB :: Fail.MonadFail m => FMB k a -> (FMB k a -> FM k a) -> m (a, FM k a)
- maxViewFMB (I _ _ (Just v) l (FMB' E) E) f = return (v, f l)
- --maxViewFMB (I i k (Just v) l (FMB' E) E) f = return (v, f (I i k Nothing l (FMB' E) E))
- maxViewFMB (I _ _ Nothing  _ (FMB' E) E) _ = error $ moduleName++".maxView: bug!"
-@@ -914,7 +916,7 @@ maxViewFMB (I i k mv l (FMB' m) E)       f = maxViewFMB m (\m' -> f (I i k mv l
- maxViewFMB (I _ k mv l m r)              f = maxViewFMB r (\r' -> f (mkVBalancedFMB k mv l m r'))
- maxViewFMB E                             _ = error $ moduleName++".maxView: bug!"
- 
--maxView :: Monad m => FM k a -> m (a, FM k a)
-+maxView :: Fail.MonadFail m => FM k a -> m (a, FM k a)
- maxView (FM Nothing E)  = fail $ moduleName++".maxView: empty map"
- maxView (FM (Just v) E) = return (v,FM Nothing E)
- maxView (FM mv fmb)     = maxViewFMB fmb (FM mv)
-@@ -930,7 +932,7 @@ maxViewWithKeyFMB (I _ k mv l m r)              kf f = maxViewWithKeyFMB r kf
- maxViewWithKeyFMB E                             _ _ = error $ moduleName++".maxViewWithKey: bug!"
- 
- 
--maxViewWithKey :: Monad m => FM k a -> m (([k],a), FM k a)
-+maxViewWithKey :: Fail.MonadFail m => FM k a -> m (([k],a), FM k a)
- maxViewWithKey (FM Nothing E)  = fail $ moduleName++".maxViewWithKey: empty map"
- maxViewWithKey (FM (Just v) E) = return (([],v),FM Nothing E)
- maxViewWithKey (FM mv fmb)     = maxViewWithKeyFMB fmb id (FM mv)
-diff --git a/src/Data/Edison/Coll/Defaults.hs b/src/Data/Edison/Coll/Defaults.hs
-index 213ed36..d927f38 100644
---- a/src/Data/Edison/Coll/Defaults.hs
-+++ b/src/Data/Edison/Coll/Defaults.hs
-@@ -14,8 +14,9 @@
- module Data.Edison.Coll.Defaults where
- 
- import Prelude hiding (null,foldr,foldl,foldr1,foldl1,lookup,filter)
--import Control.Monad.Identity
-+import qualified Control.Monad.Fail as Fail
- 
-+import Data.Edison.Prelude ( runFail_ )
- import Data.Edison.Coll
- import qualified Data.Edison.Seq as S
- import qualified Data.Edison.Seq.ListSeq as L
-@@ -81,7 +82,7 @@ disjointUsingToOrdList xs ys = disj (toOrdList xs) (toOrdList ys)
-         disj _ _ = True
- 
- intersectWitnessUsingToOrdList ::
--        (OrdColl c a, Monad m) => c -> c -> m (a,a)
-+        (OrdColl c a, Fail.MonadFail m) => c -> c -> m (a,a)
- intersectWitnessUsingToOrdList as bs = witness (toOrdList as) (toOrdList bs)
-   where witness a@(x:xs) b@(y:ys) =
-           case compare x y of
-@@ -92,7 +93,7 @@ intersectWitnessUsingToOrdList as bs = witness (toOrdList as) (toOrdList bs)
-         witness _ _ = fail $ instanceName as ++ ".intersect: failed"
- 
- lookupUsingLookupM :: Coll c a => a -> c -> a
--lookupUsingLookupM x ys = runIdentity (lookupM x ys)
-+lookupUsingLookupM x ys = runFail_ (lookupM x ys)
- 
- lookupUsingLookupAll :: Coll c a => a -> c -> a
- lookupUsingLookupAll x ys =
-@@ -100,7 +101,7 @@ lookupUsingLookupAll x ys =
-     (y:_) -> y
-     [] -> error $ instanceName ys ++ ".lookup: lookup failed"
- 
--lookupMUsingLookupAll :: (Coll c a, Monad m) => a -> c -> m a
-+lookupMUsingLookupAll :: (Coll c a, Fail.MonadFail m) => a -> c -> m a
- lookupMUsingLookupAll x ys =
-   case lookupAll x ys of
-     (y:_) -> return y
-diff --git a/src/Data/Edison/Coll/EnumSet.hs b/src/Data/Edison/Coll/EnumSet.hs
-index c93ab07..cce68e6 100644
---- a/src/Data/Edison/Coll/EnumSet.hs
-+++ b/src/Data/Edison/Coll/EnumSet.hs
-@@ -157,6 +157,7 @@ module Data.Edison.Coll.EnumSet (
- 
- import qualified Prelude
- import Prelude hiding (filter,foldl,foldr,null,map,lookup,foldl1,foldr1)
-+import qualified Control.Monad.Fail as Fail
- import qualified Data.Bits as Bits
- import Data.Bits hiding (complement)
- import Data.Word
-@@ -251,7 +252,7 @@ count = countUsingMember
- lookup :: (Eq a, Enum a) => a -> Set a -> a
- lookup = lookupUsingLookupAll
- 
--lookupM :: (Eq a, Enum a, Monad m) => a -> Set a -> m a
-+lookupM :: (Eq a, Enum a, Fail.MonadFail m) => a -> Set a -> m a
- lookupM x s
-    | member x s = return x
-    | otherwise  = fail (moduleName++".lookupM: lookup failed")
-@@ -340,12 +341,12 @@ deleteMax (Set w)
-    | w == 0    = empty
-    | otherwise = Set $ clearBit w $ msb w
- 
--minView :: (Enum a, Monad m) => Set a -> m (a, Set a)
-+minView :: (Enum a, Fail.MonadFail m) => Set a -> m (a, Set a)
- minView (Set w)
-    | w == 0    = fail (moduleName++".minView: empty set")
-    | otherwise = let i = lsb w in return (toEnum i,Set $ clearBit w i)
- 
--maxView :: (Enum a, Monad m) => Set a -> m (a, Set a)
-+maxView :: (Enum a, Fail.MonadFail m) => Set a -> m (a, Set a)
- maxView (Set w)
-    | w == 0    = fail (moduleName++".maxView: empty set")
-    | otherwise = let i = msb w in return (toEnum i, Set $ clearBit w i)
-diff --git a/src/Data/Edison/Coll/LazyPairingHeap.hs b/src/Data/Edison/Coll/LazyPairingHeap.hs
-index e41ce2e..3dcebe4 100644
---- a/src/Data/Edison/Coll/LazyPairingHeap.hs
-+++ b/src/Data/Edison/Coll/LazyPairingHeap.hs
-@@ -49,6 +49,7 @@ import Data.List (sort)
- import Data.Monoid
- import Data.Semigroup as SG
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Test.QuickCheck
- 
- moduleName :: String
-@@ -359,7 +360,7 @@ lookupAll y h = look h S.empty
-             EQ -> S.lcons x $ look i $ look xs rest
-             GT -> rest
- 
--minView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
-+minView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
- minView E = fail "LazyPairingHeap.minView: empty heap"
- minView (H1 x xs) = return (x,xs)
- minView (H2 x h xs) = return (x,union h xs)
-@@ -369,7 +370,7 @@ minElem E = error "LazyPairingHeap.minElem: empty heap"
- minElem (H1 x _) = x
- minElem (H2 x _ _) = x
- 
--maxView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
-+maxView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
- maxView E = fail "LazyPairingHeap.maxView: empty heap"
- maxView xs = return (y,xs')
-   where (xs', y) = maxView' xs
-@@ -474,7 +475,7 @@ deleteMax = deleteMaxUsingMaxView
- lookup :: Ord a => a -> Heap a -> a
- lookup = lookupUsingLookupAll
- 
--lookupM :: (Ord a, Monad m) => a -> Heap a -> m a
-+lookupM :: (Ord a, Fail.MonadFail m) => a -> Heap a -> m a
- lookupM = lookupMUsingLookupAll
- 
- lookupWithDefault :: Ord a => a -> a -> Heap a -> a
-diff --git a/src/Data/Edison/Coll/LeftistHeap.hs b/src/Data/Edison/Coll/LeftistHeap.hs
-index 751394b..10ccf5a 100644
---- a/src/Data/Edison/Coll/LeftistHeap.hs
-+++ b/src/Data/Edison/Coll/LeftistHeap.hs
-@@ -47,6 +47,7 @@ import Data.Edison.Coll.Defaults
- import Data.Monoid
- import Data.Semigroup as SG
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Test.QuickCheck
- 
- moduleName :: String
-@@ -173,7 +174,7 @@ toSeq h = tol h S.empty
-   where tol E rest = rest
-         tol (L _ x a b) rest = S.lcons x (tol b (tol a rest))
- 
--lookupM :: (Ord a, Monad m) => a -> Heap a -> m a
-+lookupM :: (Ord a, Fail.MonadFail m) => a -> Heap a -> m a
- lookupM _ E = fail "LeftistHeap.lookupM: XXX"
- lookupM x (L _ y a b) =
-   case compare x y of
-@@ -299,7 +300,7 @@ partitionLT_GT y h = (h', C.unionList hs)
-                       (b', hs'') = collect b hs'
-                   in (node x a' b', hs'')
- 
--minView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
-+minView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
- minView E = fail "LeftistHeap.minView: empty collection"
- minView (L _ x a b) = return (x, union a b)
- 
-@@ -307,7 +308,7 @@ minElem :: Ord a => Heap a -> a
- minElem E = error "LeftistHeap.minElem: empty collection"
- minElem (L _ x _ _) = x
- 
--maxView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
-+maxView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
- maxView E = fail "LeftistHeap.maxView: empty collection"
- maxView (L _ x E _) = return (x, E)
- maxView (L _ x a E) = return (y, L 1 x a' E)
-diff --git a/src/Data/Edison/Coll/MinHeap.hs b/src/Data/Edison/Coll/MinHeap.hs
-index ba38960..94e2f1b 100644
---- a/src/Data/Edison/Coll/MinHeap.hs
-+++ b/src/Data/Edison/Coll/MinHeap.hs
-@@ -46,6 +46,7 @@ import Data.Edison.Seq.Defaults (tokenMatch,maybeParens)
- import Data.Monoid
- import qualified Data.Semigroup as SG
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Test.QuickCheck
- 
- data Min h a = E | M a h  deriving (Eq)
-@@ -75,7 +76,7 @@ strict    :: (C.CollX h a,Ord a) => Min h a -> Min h a
- 
- toSeq     :: (C.Coll h a,S.Sequence s) => Min h a -> s a
- lookup    :: (C.Coll h a,Ord a) => a -> Min h a -> a
--lookupM   :: (C.Coll h a,Ord a,Monad m) => a -> Min h a -> m a
-+lookupM   :: (C.Coll h a, Ord a, Fail.MonadFail m) => a -> Min h a -> m a
- lookupAll :: (C.Coll h a,Ord a,S.Sequence s) => a -> Min h a -> s a
- lookupWithDefault :: (C.Coll h a,Ord a) => a -> a -> Min h a -> a
- fold      :: (C.Coll h a) => (a -> b -> b) -> b -> Min h a -> b
-@@ -100,9 +101,9 @@ partitionLT_GE :: (C.OrdColl h a,Ord a) => a -> Min h a -> (Min h a, Min h a)
- partitionLE_GT :: (C.OrdColl h a,Ord a) => a -> Min h a -> (Min h a, Min h a)
- partitionLT_GT :: (C.OrdColl h a,Ord a) => a -> Min h a -> (Min h a, Min h a)
- 
--minView :: (C.OrdColl h a,Ord a,Monad m) => Min h a -> m (a, Min h a)
-+minView :: (C.OrdColl h a, Ord a, Fail.MonadFail m) => Min h a -> m (a, Min h a)
- minElem :: (C.OrdColl h a,Ord a) => Min h a -> a
--maxView :: (C.OrdColl h a,Ord a,Monad m) => Min h a -> m (a, Min h a)
-+maxView :: (C.OrdColl h a, Ord a, Fail.MonadFail m) => Min h a -> m (a, Min h a)
- maxElem :: (C.OrdColl h a,Ord a) => Min h a -> a
- foldr :: (C.OrdColl h a,Ord a) => (a -> b -> b) -> b -> Min h a -> b
- foldl :: (C.OrdColl h a,Ord a) => (b -> a -> b) -> b -> Min h a -> b
-diff --git a/src/Data/Edison/Coll/SkewHeap.hs b/src/Data/Edison/Coll/SkewHeap.hs
-index 1a05ebe..e55ba58 100644
---- a/src/Data/Edison/Coll/SkewHeap.hs
-+++ b/src/Data/Edison/Coll/SkewHeap.hs
-@@ -47,6 +47,7 @@ import Data.Edison.Coll.Defaults
- import Data.Monoid
- import Data.Semigroup as SG
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- 
- import Test.QuickCheck
- 
-@@ -142,7 +143,7 @@ toSeq h = tol h S.empty
-   where tol E rest = rest
-         tol (T x a b) rest = S.lcons x (tol b (tol a rest))
- 
--lookupM :: (Ord a, Monad m) => a -> Heap a -> m a
-+lookupM :: (Ord a, Fail.MonadFail m) => a -> Heap a -> m a
- lookupM _ E = fail "SkewHeap.lookupM: XXX"
- lookupM x (T y a b) =
-   case compare x y of
-@@ -267,7 +268,7 @@ partitionLT_GT y h = (h', C.unionList hs)
-                       (b', hs'') = collect b hs'
-                   in (T x a' b', hs'')
- 
--minView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
-+minView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
- minView E = fail "SkewHeap.minView: empty heap"
- minView (T x a b) = return (x, union a b)
- 
-@@ -275,7 +276,7 @@ minElem :: Ord a => Heap a -> a
- minElem E = error "SkewHeap.minElem: empty collection"
- minElem (T x _ _) = x
- 
--maxView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
-+maxView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
- maxView E = fail "SkewHeap.maxView: empty heap"
- maxView (T x E E) = return (x, E)
- maxView (T x a E) = return (y, T x a' E)
-diff --git a/src/Data/Edison/Coll/SplayHeap.hs b/src/Data/Edison/Coll/SplayHeap.hs
-index 4e3b061..6c950b7 100644
---- a/src/Data/Edison/Coll/SplayHeap.hs
-+++ b/src/Data/Edison/Coll/SplayHeap.hs
-@@ -50,6 +50,7 @@ import Data.Edison.Coll.Defaults
- import Data.Monoid
- import Data.Semigroup as SG
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Test.QuickCheck
- 
- moduleName :: String
-@@ -93,7 +94,7 @@ strict    :: Heap a -> Heap a
- 
- toSeq     :: (Ord a, S.Sequence s) => Heap a -> s a
- lookup    :: Ord a => a -> Heap a -> a
--lookupM   :: (Ord a,Monad m) => a -> Heap a -> m a
-+lookupM   :: (Ord a, Fail.MonadFail m) => a -> Heap a -> m a
- lookupAll :: (Ord a,S.Sequence s) => a -> Heap a -> s a
- lookupWithDefault :: Ord a => a -> a -> Heap a -> a
- fold      :: Ord a => (a -> b -> b) -> b -> Heap a -> b
-@@ -118,9 +119,9 @@ partitionLT_GE   :: Ord a => a -> Heap a -> (Heap a, Heap a)
- partitionLE_GT   :: Ord a => a -> Heap a -> (Heap a, Heap a)
- partitionLT_GT   :: Ord a => a -> Heap a -> (Heap a, Heap a)
- 
--minView  :: (Ord a,Monad m) => Heap a -> m (a, Heap a)
-+minView  :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
- minElem  :: Ord a => Heap a -> a
--maxView  :: (Ord a,Monad m) => Heap a -> m (a, Heap a)
-+maxView  :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
- maxElem  :: Ord a => Heap a -> a
- foldr    :: Ord a => (a -> b -> b) -> b -> Heap a -> b
- foldl    :: Ord a => (b -> a -> b) -> b -> Heap a -> b
-diff --git a/src/Data/Edison/Coll/StandardSet.hs b/src/Data/Edison/Coll/StandardSet.hs
-index fcaf715..56df4bf 100644
---- a/src/Data/Edison/Coll/StandardSet.hs
-+++ b/src/Data/Edison/Coll/StandardSet.hs
-@@ -43,6 +43,7 @@ module Data.Edison.Coll.StandardSet (
- 
- import Prelude hiding (null,foldr,foldl,foldr1,foldl1,lookup,filter)
- import qualified Prelude
-+import qualified Control.Monad.Fail as Fail
- import qualified Data.List
- 
- import qualified Data.Edison.Coll as C
-@@ -73,7 +74,7 @@ strict     :: Ord a => Set a -> Set a
- 
- toSeq      :: (Ord a,S.Sequence seq) => Set a -> seq a
- lookup     :: Ord a => a -> Set a -> a
--lookupM    :: (Ord a,Monad m) => a -> Set a -> m a
-+lookupM    :: (Ord a, Monad m, Fail.MonadFail m) => a -> Set a -> m a
- lookupAll  :: (Ord a,S.Sequence seq) => a -> Set a -> seq a
- lookupWithDefault :: Ord a => a -> a -> Set a  -> a
- fold       :: (a -> b -> b) -> b -> Set a -> b
-@@ -98,9 +99,9 @@ partitionLT_GE   :: Ord a => a -> Set a -> (Set a, Set a)
- partitionLE_GT   :: Ord a => a -> Set a -> (Set a, Set a)
- partitionLT_GT   :: Ord a => a -> Set a -> (Set a, Set a)
- 
--minView       :: (Ord a,Monad m) => Set a -> m (a, Set a)
-+minView       :: (Ord a, Monad m, Fail.MonadFail m) => Set a -> m (a, Set a)
- minElem       :: Set a -> a
--maxView       :: (Ord a,Monad m) => Set a -> m (a, Set a)
-+maxView       :: (Ord a, Monad m, Fail.MonadFail m) => Set a -> m (a, Set a)
- maxElem       :: Set a -> a
- foldr         :: (a -> b -> b) -> b -> Set a -> b
- foldl         :: (b -> a -> b) -> b -> Set a -> b
-diff --git a/src/Data/Edison/Coll/UnbalancedSet.hs b/src/Data/Edison/Coll/UnbalancedSet.hs
-index 03cb856..d7975d0 100644
---- a/src/Data/Edison/Coll/UnbalancedSet.hs
-+++ b/src/Data/Edison/Coll/UnbalancedSet.hs
-@@ -43,6 +43,7 @@ module Data.Edison.Coll.UnbalancedSet (
- 
- import Prelude hiding (null,foldr,foldl,foldr1,foldl1,lookup,filter)
- import qualified Prelude
-+import qualified Control.Monad.Fail as Fail
- import qualified Data.Edison.Coll as C
- import qualified Data.Edison.Seq as S
- import Data.Edison.Coll.Defaults
-@@ -70,7 +71,7 @@ strict     :: Set a -> Set a
- 
- toSeq      :: (Ord a,S.Sequence seq) => Set a -> seq a
- lookup     :: Ord a => a -> Set a -> a
--lookupM    :: (Ord a,Monad m) => a -> Set a -> m a
-+lookupM    :: (Ord a, Fail.MonadFail m) => a -> Set a -> m a
- lookupAll  :: (Ord a,S.Sequence seq) => a -> Set a -> seq a
- lookupWithDefault :: Ord a => a -> a -> Set a -> a
- fold       :: (a -> b -> b) -> b -> Set a -> b
-@@ -95,9 +96,9 @@ partitionLT_GE   :: Ord a => a -> Set a -> (Set a, Set a)
- partitionLE_GT   :: Ord a => a -> Set a -> (Set a, Set a)
- partitionLT_GT   :: Ord a => a -> Set a -> (Set a, Set a)
- 
--minView       :: (Monad m) => Set a -> m (a, Set a)
-+minView       :: (Fail.MonadFail m) => Set a -> m (a, Set a)
- minElem       :: Set a -> a
--maxView       :: (Monad m) => Set a -> m (a, Set a)
-+maxView       :: (Fail.MonadFail m) => Set a -> m (a, Set a)
- maxElem       :: Set a -> a
- foldr         :: (a -> b -> b) -> b -> Set a -> b
- foldl         :: (b -> a -> b) -> b -> Set a -> b
-diff --git a/src/Data/Edison/Concrete/FingerTree.hs b/src/Data/Edison/Concrete/FingerTree.hs
-index 47f766c..c6a2ac0 100644
---- a/src/Data/Edison/Concrete/FingerTree.hs
-+++ b/src/Data/Edison/Concrete/FingerTree.hs
-@@ -81,6 +81,7 @@ import Test.QuickCheck
- import Data.Edison.Prelude
- 
- import Control.Monad (liftM2, liftM3, liftM4)
-+import qualified Control.Monad.Fail as Fail
- 
- 
- infixr 5 `lcons`
-@@ -334,7 +335,7 @@ null Empty = True
- null _ = False
- 
- -- | /O(1)/. Analyse the left end of a sequence.
--lview :: (Measured v a, Monad m) => FingerTree v a -> m (a,FingerTree v a)
-+lview :: (Measured v a, Fail.MonadFail m) => FingerTree v a -> m (a,FingerTree v a)
- lview Empty                 =  fail "FingerTree.lview: empty tree"
- lview (Single x)            =  return (x, Empty)
- lview (Deep _ (One x) m sf) =  return . (,) x $
-@@ -357,7 +358,7 @@ ltailDigit (Four _ b c d) = Three b c d
- ltailDigit _ = error "FingerTree.ltailDigit: bug!"
- 
- -- | /O(1)/. Analyse the right end of a sequence.
--rview :: (Measured v a, Monad m) => FingerTree v a -> m (a, FingerTree v a)
-+rview :: (Measured v a, Fail.MonadFail m) => FingerTree v a -> m (a, FingerTree v a)
- rview Empty                  = fail "FingerTree.rview: empty tree"
- rview (Single x)             = return (x, Empty)
- rview (Deep _ pr m (One x))  = return . (,) x $
-diff --git a/src/Data/Edison/Seq/BankersQueue.hs b/src/Data/Edison/Seq/BankersQueue.hs
-index 6dac746..0ab24c9 100644
---- a/src/Data/Edison/Seq/BankersQueue.hs
-+++ b/src/Data/Edison/Seq/BankersQueue.hs
-@@ -51,11 +51,13 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
- 
- import qualified Control.Applicative as App
- 
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.Edison.Seq as S ( Sequence(..) )
- import Data.Edison.Seq.Defaults
- import qualified Data.Edison.Seq.ListSeq as L
- import Data.Monoid
- import Data.Semigroup as SG
-+import qualified Control.Monad.Fail as Fail
- import Control.Monad.Identity
- import Test.QuickCheck
- 
-@@ -66,16 +68,16 @@ singleton      :: a -> Seq a
- lcons          :: a -> Seq a -> Seq a
- rcons          :: a -> Seq a -> Seq a
- append         :: Seq a -> Seq a -> Seq a
--lview          :: (Monad m) => Seq a -> m (a, Seq a)
-+lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- lhead          :: Seq a -> a
--lheadM         :: (Monad m) => Seq a -> m a
-+lheadM         :: (Fail.MonadFail m) => Seq a -> m a
- ltail          :: Seq a -> Seq a
--ltailM         :: (Monad m) => Seq a -> m (Seq a)
--rview          :: (Monad m) => Seq a -> m (a, Seq a)
-+ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
-+rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- rhead          :: Seq a -> a
--rheadM         :: (Monad m) => Seq a -> m a
-+rheadM         :: (Fail.MonadFail m) => Seq a -> m a
- rtail          :: Seq a -> Seq a
--rtailM         :: (Monad m) => Seq a -> m (Seq a)
-+rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
- null           :: Seq a -> Bool
- size           :: Seq a -> Int
- concat         :: Seq (Seq a) -> Seq a
-@@ -106,7 +108,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
- copy           :: Int -> a -> Seq a
- inBounds       :: Int -> Seq a -> Bool
- lookup         :: Int -> Seq a -> a
--lookupM        :: (Monad m) => Int -> Seq a -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
- lookupWithDefault :: a -> Int -> Seq a -> a
- update         :: Int -> a -> Seq a -> Seq a
- adjust         :: (a -> a) -> Int -> Seq a -> Seq a
-@@ -263,7 +265,7 @@ copy n x
- 
- -- reduce1: given sizes could do more effective job of dividing evenly!
- 
--lookup idx q = runIdentity (lookupM idx q)
-+lookup idx q = runFail_ (lookupM idx q)
- 
- lookupM idx (Q i xs ys j)
-   | idx < i   = L.lookupM idx xs
-diff --git a/src/Data/Edison/Seq/BinaryRandList.hs b/src/Data/Edison/Seq/BinaryRandList.hs
-index b01b9b8..e772b65 100644
---- a/src/Data/Edison/Seq/BinaryRandList.hs
-+++ b/src/Data/Edison/Seq/BinaryRandList.hs
-@@ -55,14 +55,15 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
-                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
- 
- import qualified Control.Applicative as App
--import Control.Monad.Identity
- import Data.Maybe
- 
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.Edison.Seq as S ( Sequence(..) )
- import Data.Edison.Seq.Defaults
- import Data.Monoid
- import Data.Semigroup as SG
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Test.QuickCheck
- 
- -- signatures for exported functions
-@@ -72,16 +73,16 @@ singleton      :: a -> Seq a
- lcons          :: a -> Seq a -> Seq a
- rcons          :: a -> Seq a -> Seq a
- append         :: Seq a -> Seq a -> Seq a
--lview          :: (Monad m) => Seq a -> m (a, Seq a)
-+lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- lhead          :: Seq a -> a
--lheadM         :: (Monad m) => Seq a -> m a
-+lheadM         :: (Fail.MonadFail m) => Seq a -> m a
- ltail          :: Seq a -> Seq a
--ltailM         :: (Monad m) => Seq a -> m (Seq a)
--rview          :: (Monad m) => Seq a -> m (a, Seq a)
-+ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
-+rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- rhead          :: Seq a -> a
--rheadM         :: (Monad m) => Seq a -> m a
-+rheadM         :: (Fail.MonadFail m) => Seq a -> m a
- rtail          :: Seq a -> Seq a
--rtailM         :: (Monad m) => Seq a -> m (Seq a)
-+rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
- null           :: Seq a -> Bool
- size           :: Seq a -> Int
- concat         :: Seq (Seq a) -> Seq a
-@@ -112,7 +113,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
- copy           :: Int -> a -> Seq a
- inBounds       :: Int -> Seq a -> Bool
- lookup         :: Int -> Seq a -> a
--lookupM        :: (Monad m) => Int -> Seq a -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
- lookupWithDefault :: a -> Int -> Seq a -> a
- update         :: Int -> a -> Seq a -> Seq a
- adjust         :: (a -> a) -> Int -> Seq a -> Seq a
-@@ -267,7 +268,7 @@ inBounds i xs = (i >= 0) && inb xs i
-         inb (Even ps) i = inb ps (half i)
-         inb (Odd _ ps) i = (i == 0) || inb ps (half (i-1))
- 
--lookup i xs = runIdentity (lookupM i xs)
-+lookup i xs = runFail_ (lookupM i xs)
- 
- lookupM i xs
-     | i < 0     = fail "BinaryRandList.lookup: bad subscript"
-diff --git a/src/Data/Edison/Seq/BraunSeq.hs b/src/Data/Edison/Seq/BraunSeq.hs
-index 7f6f33b..11236e3 100644
---- a/src/Data/Edison/Seq/BraunSeq.hs
-+++ b/src/Data/Edison/Seq/BraunSeq.hs
-@@ -72,6 +72,7 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
-                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
- 
- import qualified Control.Applicative as App
-+import qualified Control.Monad.Fail as Fail
- import Control.Monad.Identity
- import Data.Maybe
- import Data.Monoid
-@@ -79,6 +80,7 @@ import Data.Semigroup as SG
- import Test.QuickCheck
- 
- 
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.Edison.Seq as S ( Sequence(..) )
- import Data.Edison.Seq.Defaults
- import qualified Data.Edison.Seq.ListSeq as L
-@@ -91,16 +93,16 @@ singleton      :: a -> Seq a
- lcons          :: a -> Seq a -> Seq a
- rcons          :: a -> Seq a -> Seq a
- append         :: Seq a -> Seq a -> Seq a
--lview          :: (Monad m) => Seq a -> m (a, Seq a)
-+lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- lhead          :: Seq a -> a
--lheadM         :: (Monad m) => Seq a -> m a
-+lheadM         :: (Fail.MonadFail m) => Seq a -> m a
- ltail          :: Seq a -> Seq a
--ltailM         :: (Monad m) => Seq a -> m (Seq a)
--rview          :: (Monad m) => Seq a -> m (a, Seq a)
-+ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
-+rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- rhead          :: Seq a -> a
--rheadM         :: (Monad m) => Seq a -> m a
-+rheadM         :: (Fail.MonadFail m) => Seq a -> m a
- rtail          :: Seq a -> Seq a
--rtailM         :: (Monad m) => Seq a -> m (Seq a)
-+rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
- null           :: Seq a -> Bool
- size           :: Seq a -> Int
- concat         :: Seq (Seq a) -> Seq a
-@@ -131,7 +133,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
- copy           :: Int -> a -> Seq a
- inBounds       :: Int -> Seq a -> Bool
- lookup         :: Int -> Seq a -> a
--lookupM        :: (Monad m) => Int -> Seq a -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
- lookupWithDefault :: a -> Int -> Seq a -> a
- update         :: Int -> a -> Seq a -> Seq a
- adjust         :: (a -> a) -> Int -> Seq a -> Seq a
-@@ -344,7 +346,7 @@ inBounds i xs = (i >= 0) && inb xs i
-           | i == 0    = True
-           | otherwise = inb b (half i - 1)
- 
--lookup i xs = runIdentity (lookupM i xs)
-+lookup i xs = runFail_ (lookupM i xs)
- 
- lookupM i xs
-   | i < 0     = fail "BraunSeq.lookupM: bad subscript"
-diff --git a/src/Data/Edison/Seq/Defaults.hs b/src/Data/Edison/Seq/Defaults.hs
-index ed593dc..eae6a09 100644
---- a/src/Data/Edison/Seq/Defaults.hs
-+++ b/src/Data/Edison/Seq/Defaults.hs
-@@ -17,9 +17,11 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
-                        filter,takeWhile,dropWhile,lookup,take,drop,splitAt,
-                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
- 
-+import qualified Control.Monad.Fail as Fail
- import Control.Monad.Identity
- import Data.Char (isSpace)
- 
-+import Data.Edison.Prelude ( runFail_ )
- import Data.Edison.Seq
- import qualified Data.Edison.Seq.ListSeq as L
- 
-@@ -33,7 +35,7 @@ appendUsingFoldr :: Sequence s => s a -> s a -> s a
- appendUsingFoldr s t | null t = s
-                             | otherwise = foldr lcons t s
- 
--rviewDefault :: (Monad m, Sequence s) => s a -> m (a, s a)
-+rviewDefault :: (Fail.MonadFail m, Sequence s) => s a -> m (a, s a)
- rviewDefault xs
-   | null xs   = fail $ instanceName xs ++ ".rview: empty sequence"
-   | otherwise = return (rhead xs, rtail xs)
-@@ -49,7 +51,7 @@ rtailUsingLview xs =
-             Nothing      -> empty
-             Just (y, ys) -> lcons x (rt y ys)
- 
--rtailMUsingLview :: (Monad m,Sequence s) => s a -> m (s a)
-+rtailMUsingLview :: (Fail.MonadFail m, Sequence s) => s a -> m (s a)
- rtailMUsingLview xs =
-     case lview xs of
-       Nothing      -> fail $ instanceName xs ++ ".rtailM: empty sequence"
-@@ -200,7 +202,7 @@ inBoundsUsingSize :: Sequence s => Int -> s a -> Bool
- inBoundsUsingSize i s = i >= 0 && i < size s
- 
- lookupUsingLookupM :: Sequence s => Int -> s a -> a
--lookupUsingLookupM i s = runIdentity (lookupM i s)
-+lookupUsingLookupM i s = runFail_ (lookupM i s)
- 
- lookupUsingDrop :: Sequence s => Int -> s a -> a
- lookupUsingDrop i s
-@@ -220,7 +222,7 @@ lookupWithDefaultUsingDrop d i s
-   | otherwise = lhead s'
-   where s' = drop i s
- 
--lookupMUsingDrop :: (Monad m, Sequence s) => Int -> s a -> m a
-+lookupMUsingDrop :: (Fail.MonadFail m, Sequence s) => Int -> s a -> m a
- lookupMUsingDrop i s
-   -- XXX better error message!
-   | i < 0 || null s' = fail $ instanceName s
-diff --git a/src/Data/Edison/Seq/FingerSeq.hs b/src/Data/Edison/Seq/FingerSeq.hs
-index c74c70b..a34254c 100644
---- a/src/Data/Edison/Seq/FingerSeq.hs
-+++ b/src/Data/Edison/Seq/FingerSeq.hs
-@@ -37,9 +37,10 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
-                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
- 
- import qualified Control.Applicative as App
--import Data.Edison.Prelude (measure, Measured())
-+import Data.Edison.Prelude (measure, Measured(), runFail_)
- import qualified Data.Edison.Seq as S
- import Data.Edison.Seq.Defaults
-+import qualified Control.Monad.Fail as Fail
- import Control.Monad.Identity
- import Data.Monoid
- import Data.Semigroup as SG
-@@ -87,16 +88,16 @@ singleton      :: a -> Seq a
- lcons          :: a -> Seq a -> Seq a
- rcons          :: a -> Seq a -> Seq a
- append         :: Seq a -> Seq a -> Seq a
--lview          :: (Monad m) => Seq a -> m (a, Seq a)
-+lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- lhead          :: Seq a -> a
--lheadM         :: (Monad m) => Seq a -> m a
-+lheadM         :: (Fail.MonadFail m) => Seq a -> m a
- ltail          :: Seq a -> Seq a
--ltailM         :: (Monad m) => Seq a -> m (Seq a)
--rview          :: (Monad m) => Seq a -> m (a, Seq a)
-+ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
-+rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- rhead          :: Seq a -> a
--rheadM         :: (Monad m) => Seq a -> m a
-+rheadM         :: (Fail.MonadFail m) => Seq a -> m a
- rtail          :: Seq a -> Seq a
--rtailM         :: (Monad m) => Seq a -> m (Seq a)
-+rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
- null           :: Seq a -> Bool
- size           :: Seq a -> Int
- concat         :: Seq (Seq a) -> Seq a
-@@ -127,7 +128,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
- copy           :: Int -> a -> Seq a
- inBounds       :: Int -> Seq a -> Bool
- lookup         :: Int -> Seq a -> a
--lookupM        :: (Monad m) => Int -> Seq a -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
- lookupWithDefault :: a -> Int -> Seq a -> a
- update         :: Int -> a -> Seq a -> Seq a
- adjust         :: (a -> a) -> Int -> Seq a -> Seq a
-@@ -206,10 +207,10 @@ lheadM xs = lview xs >>= return . fst
- ltailM xs = lview xs >>= return . snd
- rheadM xs = rview xs >>= return . fst
- rtailM xs = rview xs >>= return . snd
--lhead = runIdentity . lheadM
--ltail = runIdentity . ltailM
--rhead = runIdentity . rheadM
--rtail = runIdentity . rtailM
-+lhead = runFail_ . lheadM
-+ltail = runFail_ . ltailM
-+rhead = runFail_ . rheadM
-+rtail = runFail_ . rtailM
- 
- fold     = foldr
- fold'    = foldr'
-diff --git a/src/Data/Edison/Seq/JoinList.hs b/src/Data/Edison/Seq/JoinList.hs
-index 6922023..05855ba 100644
---- a/src/Data/Edison/Seq/JoinList.hs
-+++ b/src/Data/Edison/Seq/JoinList.hs
-@@ -57,6 +57,7 @@ import qualified Control.Applicative as App
- 
- import Data.Edison.Seq.Defaults
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Data.Monoid
- import Data.Semigroup as SG
- import Test.QuickCheck
-@@ -68,16 +69,16 @@ singleton      :: a -> Seq a
- lcons          :: a -> Seq a -> Seq a
- rcons          :: a -> Seq a -> Seq a
- append         :: Seq a -> Seq a -> Seq a
--lview          :: (Monad m) => Seq a -> m (a, Seq a)
-+lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- lhead          :: Seq a -> a
--lheadM         :: (Monad m) => Seq a -> m a
-+lheadM         :: (Fail.MonadFail m) => Seq a -> m a
- ltail          :: Seq a -> Seq a
--ltailM         :: (Monad m) => Seq a -> m (Seq a)
--rview          :: (Monad m) => Seq a -> m (a, Seq a)
-+ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
-+rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- rhead          :: Seq a -> a
--rheadM         :: (Monad m) => Seq a -> m a
-+rheadM         :: (Fail.MonadFail m) => Seq a -> m a
- rtail          :: Seq a -> Seq a
--rtailM         :: (Monad m) => Seq a -> m (Seq a)
-+rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
- null           :: Seq a -> Bool
- size           :: Seq a -> Int
- concat         :: Seq (Seq a) -> Seq a
-@@ -108,7 +109,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
- copy           :: Int -> a -> Seq a
- inBounds       :: Int -> Seq a -> Bool
- lookup         :: Int -> Seq a -> a
--lookupM        :: (Monad m) => Int -> Seq a -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
- lookupWithDefault :: a -> Int -> Seq a -> a
- update         :: Int -> a -> Seq a -> Seq a
- adjust         :: (a -> a) -> Int -> Seq a -> Seq a
-diff --git a/src/Data/Edison/Seq/MyersStack.hs b/src/Data/Edison/Seq/MyersStack.hs
-index 30eb197..eca46a5 100644
---- a/src/Data/Edison/Seq/MyersStack.hs
-+++ b/src/Data/Edison/Seq/MyersStack.hs
-@@ -49,8 +49,10 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
-                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
- 
- import qualified Control.Applicative as App
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.Edison.Seq as S ( Sequence(..) )
- import Data.Edison.Seq.Defaults
-+import qualified Control.Monad.Fail as Fail
- import Control.Monad.Identity
- import Data.Monoid
- import Data.Semigroup as SG
-@@ -63,16 +65,16 @@ singleton      :: a -> Seq a
- lcons          :: a -> Seq a -> Seq a
- rcons          :: a -> Seq a -> Seq a
- append         :: Seq a -> Seq a -> Seq a
--lview          :: (Monad m) => Seq a -> m (a, Seq a)
-+lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- lhead          :: Seq a -> a
--lheadM         :: (Monad m) => Seq a -> m a
-+lheadM         :: (Fail.MonadFail m) => Seq a -> m a
- ltail          :: Seq a -> Seq a
--ltailM         :: (Monad m) => Seq a -> m (Seq a)
--rview          :: (Monad m) => Seq a -> m (a, Seq a)
-+ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
-+rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- rhead          :: Seq a -> a
--rheadM         :: (Monad m) => Seq a -> m a
-+rheadM         :: (Fail.MonadFail m) => Seq a -> m a
- rtail          :: Seq a -> Seq a
--rtailM         :: (Monad m) => Seq a -> m (Seq a)
-+rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
- null           :: Seq a -> Bool
- size           :: Seq a -> Int
- concat         :: Seq (Seq a) -> Seq a
-@@ -103,7 +105,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
- copy           :: Int -> a -> Seq a
- inBounds       :: Int -> Seq a -> Bool
- lookup         :: Int -> Seq a -> a
--lookupM        :: (Monad m) => Int -> Seq a -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
- lookupWithDefault :: a -> Int -> Seq a -> a
- update         :: Int -> a -> Seq a -> Seq a
- adjust         :: (a -> a) -> Int -> Seq a -> Seq a
-@@ -246,7 +248,7 @@ inBounds i xs = inb xs i
-           | i < j     = (i >= 0)
-           | otherwise = inb xs' (i - j)
- 
--lookup i xs = runIdentity (lookupM i xs)
-+lookup i xs = runFail_ (lookupM i xs)
- 
- lookupM i xs = look xs i
-   where look E _ = fail "MyersStack.lookup: bad subscript"
-diff --git a/src/Data/Edison/Seq/RandList.hs b/src/Data/Edison/Seq/RandList.hs
-index 8fe97bd..8d2d38b 100644
---- a/src/Data/Edison/Seq/RandList.hs
-+++ b/src/Data/Edison/Seq/RandList.hs
-@@ -55,8 +55,10 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
- 
- import qualified Control.Applicative as App
- 
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.Edison.Seq as S( Sequence(..) )
- import Data.Edison.Seq.Defaults
-+import qualified Control.Monad.Fail as Fail
- import Control.Monad.Identity
- import Data.Monoid
- import Data.Semigroup as SG
-@@ -69,16 +71,16 @@ singleton      :: a -> Seq a
- lcons          :: a -> Seq a -> Seq a
- rcons          :: a -> Seq a -> Seq a
- append         :: Seq a -> Seq a -> Seq a
--lview          :: (Monad m) => Seq a -> m (a, Seq a)
-+lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- lhead          :: Seq a -> a
--lheadM         :: (Monad m) => Seq a -> m a
-+lheadM         :: (Fail.MonadFail m) => Seq a -> m a
- ltail          :: Seq a -> Seq a
--ltailM         :: (Monad m) => Seq a -> m (Seq a)
--rview          :: (Monad m) => Seq a -> m (a, Seq a)
-+ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
-+rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- rhead          :: Seq a -> a
--rheadM         :: (Monad m) => Seq a -> m a
-+rheadM         :: (Fail.MonadFail m) => Seq a -> m a
- rtail          :: Seq a -> Seq a
--rtailM         :: (Monad m) => Seq a -> m (Seq a)
-+rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
- null           :: Seq a -> Bool
- size           :: Seq a -> Int
- concat         :: Seq (Seq a) -> Seq a
-@@ -109,7 +111,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
- copy           :: Int -> a -> Seq a
- inBounds       :: Int -> Seq a -> Bool
- lookup         :: Int -> Seq a -> a
--lookupM        :: (Monad m) => Int -> Seq a -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
- lookupWithDefault :: a -> Int -> Seq a -> a
- update         :: Int -> a -> Seq a -> Seq a
- adjust         :: (a -> a) -> Int -> Seq a -> Seq a
-@@ -269,7 +271,7 @@ inBounds i xs = inb xs i
-           | i < j     = (i >= 0)
-           | otherwise = inb xs (i - j)
- 
--lookup i xs = runIdentity (lookupM i xs)
-+lookup i xs = runFail_ (lookupM i xs)
- 
- lookupM i xs = look xs i
-   where look E _ = fail "RandList.lookup bad subscript"
-diff --git a/src/Data/Edison/Seq/RevSeq.hs b/src/Data/Edison/Seq/RevSeq.hs
-index 3652c7b..87deea6 100644
---- a/src/Data/Edison/Seq/RevSeq.hs
-+++ b/src/Data/Edison/Seq/RevSeq.hs
-@@ -62,6 +62,7 @@ import qualified Data.Edison.Seq as S
- import qualified Data.Edison.Seq.ListSeq as L
- import Data.Edison.Seq.Defaults -- only used by concatMap
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Data.Monoid
- import Data.Semigroup as SG
- import Test.QuickCheck
-@@ -75,16 +76,16 @@ singleton      :: S.Sequence s => a -> Rev s a
- lcons          :: S.Sequence s => a -> Rev s a -> Rev s a
- rcons          :: S.Sequence s => a -> Rev s a -> Rev s a
- append         :: S.Sequence s => Rev s a -> Rev s a -> Rev s a
--lview          :: (S.Sequence s, Monad m) => Rev s a -> m (a, Rev s a)
-+lview          :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m (a, Rev s a)
- lhead          :: S.Sequence s => Rev s a -> a
--lheadM         :: (S.Sequence s, Monad m) => Rev s a -> m a
-+lheadM         :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m a
- ltail          :: S.Sequence s => Rev s a -> Rev s a
--ltailM         :: (S.Sequence s, Monad m) => Rev s a -> m (Rev s a)
--rview          :: (S.Sequence s, Monad m) => Rev s a -> m (a, Rev s a)
-+ltailM         :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m (Rev s a)
-+rview          :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m (a, Rev s a)
- rhead          :: S.Sequence s => Rev s a -> a
--rheadM         :: (S.Sequence s, Monad m) => Rev s a -> m a
-+rheadM         :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m a
- rtail          :: S.Sequence s => Rev s a -> Rev s a
--rtailM         :: (S.Sequence s, Monad m) => Rev s a -> m (Rev s a)
-+rtailM         :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m (Rev s a)
- null           :: S.Sequence s => Rev s a -> Bool
- size           :: S.Sequence s => Rev s a -> Int
- concat         :: S.Sequence s => Rev s (Rev s a) -> Rev s a
-@@ -115,7 +116,7 @@ reduce1'       :: S.Sequence s => (a -> a -> a) -> Rev s a -> a
- copy           :: S.Sequence s => Int -> a -> Rev s a
- inBounds       :: S.Sequence s => Int -> Rev s a -> Bool
- lookup         :: S.Sequence s => Int -> Rev s a -> a
--lookupM        :: (S.Sequence s, Monad m) => Int -> Rev s a -> m a
-+lookupM        :: (S.Sequence s, Fail.MonadFail m) => Int -> Rev s a -> m a
- lookupWithDefault :: S.Sequence s => a -> Int -> Rev s a -> a
- update         :: S.Sequence s => Int -> a -> Rev s a -> Rev s a
- adjust         :: S.Sequence s => (a -> a) -> Int -> Rev s a -> Rev s a
-diff --git a/src/Data/Edison/Seq/SimpleQueue.hs b/src/Data/Edison/Seq/SimpleQueue.hs
-index 64592b6..754108f 100644
---- a/src/Data/Edison/Seq/SimpleQueue.hs
-+++ b/src/Data/Edison/Seq/SimpleQueue.hs
-@@ -59,6 +59,7 @@ import qualified Data.Edison.Seq.ListSeq as L
- import Data.Monoid
- import Data.Semigroup as SG
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Test.QuickCheck
- 
- -- signatures for exported functions
-@@ -68,16 +69,16 @@ singleton      :: a -> Seq a
- lcons          :: a -> Seq a -> Seq a
- rcons          :: a -> Seq a -> Seq a
- append         :: Seq a -> Seq a -> Seq a
--lview          :: (Monad m) => Seq a -> m (a, Seq a)
-+lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- lhead          :: Seq a -> a
--lheadM         :: (Monad m) => Seq a -> m a
-+lheadM         :: (Fail.MonadFail m) => Seq a -> m a
- ltail          :: Seq a -> Seq a
--ltailM         :: (Monad m) => Seq a -> m (Seq a)
--rview          :: (Monad m) => Seq a -> m (a, Seq a)
-+ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
-+rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- rhead          :: Seq a -> a
--rheadM         :: (Monad m) => Seq a -> m a
-+rheadM         :: (Fail.MonadFail m) => Seq a -> m a
- rtail          :: Seq a -> Seq a
--rtailM         :: (Monad m) => Seq a -> m (Seq a)
-+rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
- null           :: Seq a -> Bool
- size           :: Seq a -> Int
- concat         :: Seq (Seq a) -> Seq a
-@@ -108,7 +109,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
- copy           :: Int -> a -> Seq a
- inBounds       :: Int -> Seq a -> Bool
- lookup         :: Int -> Seq a -> a
--lookupM        :: (Monad m) => Int -> Seq a -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
- lookupWithDefault :: a -> Int -> Seq a -> a
- update         :: Int -> a -> Seq a -> Seq a
- adjust         :: (a -> a) -> Int -> Seq a -> Seq a
-diff --git a/src/Data/Edison/Seq/SizedSeq.hs b/src/Data/Edison/Seq/SizedSeq.hs
-index a50b800..65c0ee9 100644
---- a/src/Data/Edison/Seq/SizedSeq.hs
-+++ b/src/Data/Edison/Seq/SizedSeq.hs
-@@ -54,6 +54,7 @@ import Data.Edison.Seq.Defaults -- only used by concatMap
- import Data.Monoid
- import Data.Semigroup as SG
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Test.QuickCheck
- 
- 
-@@ -65,16 +66,16 @@ singleton      :: S.Sequence s => a -> Sized s a
- lcons          :: S.Sequence s => a -> Sized s a -> Sized s a
- rcons          :: S.Sequence s => a -> Sized s a -> Sized s a
- append         :: S.Sequence s => Sized s a -> Sized s a -> Sized s a
--lview          :: (S.Sequence s, Monad m) => Sized s a -> m (a, Sized s a)
-+lview          :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m (a, Sized s a)
- lhead          :: S.Sequence s => Sized s a -> a
--lheadM         :: (S.Sequence s, Monad m) => Sized s a -> m a
-+lheadM         :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m a
- ltail          :: S.Sequence s => Sized s a -> Sized s a
--ltailM         :: (S.Sequence s, Monad m) => Sized s a -> m (Sized s a)
--rview          :: (S.Sequence s, Monad m) => Sized s a -> m (a, Sized s a)
-+ltailM         :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m (Sized s a)
-+rview          :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m (a, Sized s a)
- rhead          :: S.Sequence s => Sized s a -> a
--rheadM         :: (S.Sequence s, Monad m) => Sized s a -> m a
-+rheadM         :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m a
- rtail          :: S.Sequence s => Sized s a -> Sized s a
--rtailM         :: (S.Sequence s, Monad m) => Sized s a -> m (Sized s a)
-+rtailM         :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m (Sized s a)
- null           :: S.Sequence s => Sized s a -> Bool
- size           :: S.Sequence s => Sized s a -> Int
- concat         :: S.Sequence s => Sized s (Sized s a) -> Sized s a
-@@ -105,7 +106,7 @@ reduce1'       :: S.Sequence s => (a -> a -> a) -> Sized s a -> a
- copy           :: S.Sequence s => Int -> a -> Sized s a
- inBounds       :: S.Sequence s => Int -> Sized s a -> Bool
- lookup         :: S.Sequence s => Int -> Sized s a -> a
--lookupM        :: (S.Sequence s, Monad m) => Int -> Sized s a -> m a
-+lookupM        :: (S.Sequence s, Fail.MonadFail m) => Int -> Sized s a -> m a
- lookupWithDefault :: S.Sequence s => a -> Int -> Sized s a -> a
- update         :: S.Sequence s => Int -> a -> Sized s a -> Sized s a
- adjust         :: S.Sequence s => (a -> a) -> Int -> Sized s a -> Sized s a
-
diff --git a/dev-haskell/edit-distance/Manifest b/dev-haskell/edit-distance/Manifest
index 544d9772f15b..bdf65696dfad 100644
--- a/dev-haskell/edit-distance/Manifest
+++ b/dev-haskell/edit-distance/Manifest
@@ -1,3 +1,3 @@
 DIST edit-distance-0.2.2.1.tar.gz 13228 BLAKE2B a7e57e19f61497cfa24c1a038e860d2b0d616f4a3528db3c315c12f3bd04554e003009f1b07b2fdd6be7a8387b0205dde4d00da8b0a05f5c4b7ab0c17fca159f SHA512 67d19c9f5712191f88641d32ff0b84aaf05c2acd71cfa81a17675690ac9076b34aff687afa8501f8b22ddcece12a439e053265d14b70dc155b0e08406050fdd7
-EBUILD edit-distance-0.2.2.1-r1.ebuild 830 BLAKE2B 2b53000c774ac5882ca7b68c535d72171541843b5bde33e4b66d8a463f4e81e24d8c4b91f6855e7117eae1de162b4a32f955c281cc176cc8a42d0e0a29ed5660 SHA512 08706ff93b7fe30734b950a49cf904ac157951df9882fc88062eb47473d53314f74a75e853312bd01603397138956635bb0d78adc8e79e7b1dafe505dc69ea73
-MISC metadata.xml 497 BLAKE2B 934f2f3ee39e2f9d8d10b11961e3e97a464843310378f7121d1e96e06d7c75f7aa68e17a97a7009d3af5f23101b79267b2e57e19d281f42c59e88a33ee189d99 SHA512 f84d69e8385d45779047219523a748ff08e61ddf83649f37c0a253688006fbcc09ba72d81b78caa059fd73dc491ec9f96f524fbeae0cf333f86bbb0561df921c
+EBUILD edit-distance-0.2.2.1-r1.ebuild 840 BLAKE2B 2740a3527a971bc273d4d524d1a1b1eb22981e99817b22e113fc7fac5057eb891921906cb62941960a336d1d3f98082a8ff7bc7acbdd0d13ace5bf7515e9ed4c SHA512 5d4caa4cd2591a18939b883e384118f5ad61238e6f5f833601f627266a7f4ffde2de793945169dbb1a29d84178c829eebdd14dda4329170b8978986e798d65f1
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild b/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
index 568102a4434a..30e1b8aee32d 100644
--- a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
+++ b/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
@@ -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.5.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	default
+
 	cabal_chdeps \
 		'QuickCheck >= 2.4 && <2.9' 'QuickCheck >= 2.4'
 }
diff --git a/dev-haskell/edit-distance/metadata.xml b/dev-haskell/edit-distance/metadata.xml
index a2d0a723f92f..b7878815d80d 100644
--- a/dev-haskell/edit-distance/metadata.xml
+++ b/dev-haskell/edit-distance/metadata.xml
@@ -5,10 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Optimized edit distances for fuzzy matching, including Levenshtein and restricted Damerau-Levenshtein algorithms.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">batterseapower/edit-distance</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/email-validate/Manifest b/dev-haskell/email-validate/Manifest
index fe9802c11912..d71b3b5fee85 100644
--- a/dev-haskell/email-validate/Manifest
+++ b/dev-haskell/email-validate/Manifest
@@ -1,3 +1,3 @@
-DIST email-validate-2.0.1.tar.gz 7462 BLAKE2B f385a0e585191a1810270397077f5f2b675dacc8ed89eb256e4e1848e40dafe79d037516c2ab0b7f7d5aae42a7d04399b9e9c9a5b12fc1b2eda753a3580de810 SHA512 d5eb0d48c81fa61c5bdecbb1cc35e370afbcb49277091b7358a01518711dfda94ec4074c7462f1efa088cc964408db083481da976d64283868baa130abf7089e
-EBUILD email-validate-2.0.1.ebuild 844 BLAKE2B 0c47ea064f12c8b3d5adc75ef58c5272f8e6a113ff989742505b87bf8e9db2a42920813b5d51dadbc9bda1aeefafc41a0313f927c317f7ac3ff098e8c7f4f6b1 SHA512 757e2382dd7a2bcc5ed2f98ea1171cb742f9b2daff9a100e5d1acf83146f4a4835b6672b3204c3d3fc563f47834aefdcaaed629985626d62cb1460466b98c291
+DIST email-validate-2.3.2.13.tar.gz 9635 BLAKE2B fecdc9017dcb00847662043774920b09e65a24876efdc1248f24b942bbd79b9d6b79640b479bbbf44c2d80349cfc3511b63884f4e3947949346773dbca9c8a06 SHA512 22cf7517ae38aa264198288449946cc7da6bda7f799a652050de9544c9e07c5bbe6bf8c8b53526be227288214bf3144055effd858fb993704942eeda3410ba3d
+EBUILD email-validate-2.3.2.13.ebuild 808 BLAKE2B 0c37d4673b97dc3073d480ccccb38ec786c271ad09278a0f2ff5cc29ea2833124b1b25c337cc6ead3beaffa6f928127c210381370b9eda4714b4cbe742aa6767 SHA512 4dbec3801632ab71e54b85078987e0d29c73800e6bd50788bae731d1d3965fe3f655fdd44ed0504dbce421cd2d6d10ae45bd1a5ae745f1de82ec2970a487144f
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/email-validate/email-validate-2.0.1.ebuild b/dev-haskell/email-validate/email-validate-2.0.1.ebuild
deleted file mode 100644
index f50409f9a818..000000000000
--- a/dev-haskell/email-validate/email-validate-2.0.1.ebuild
+++ /dev/null
@@ -1,30 +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 test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Validating an email address string against RFC 5322"
-HOMEPAGE="http://porg.es/blog/email-address-validation-simpler-faster-more-correct"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.4.1
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/email-validate/email-validate-2.3.2.13.ebuild b/dev-haskell/email-validate/email-validate-2.3.2.13.ebuild
new file mode 100644
index 000000000000..18fbf2c80376
--- /dev/null
+++ b/dev-haskell/email-validate/email-validate-2.3.2.13.ebuild
@@ -0,0 +1,28 @@
+# 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="Email address validation"
+HOMEPAGE="https://github.com/Porges/email-validate-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/doctest-0.8 <dev-haskell/doctest-0.17
+		>=dev-haskell/hspec-2.2.3 <dev-haskell/hspec-2.8
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15 )
+"
diff --git a/dev-haskell/errorcall-eq-instance/Manifest b/dev-haskell/errorcall-eq-instance/Manifest
index 600262fab50c..b9ca33f94a00 100644
--- a/dev-haskell/errorcall-eq-instance/Manifest
+++ b/dev-haskell/errorcall-eq-instance/Manifest
@@ -1,3 +1,3 @@
 DIST errorcall-eq-instance-0.3.0.tar.gz 1534 BLAKE2B 6b137de15395742d5c73e1e9f1b06f88109675da701d7d65e40879b844b4ebbe4d8400fec44a12388af3a4ab1dddec30a8365e63eb8f042805ad020a575de325 SHA512 934ee3b3f00d7d32b9aa384a568cfc9c99a3947cb39cdc23495dda21acd0672d6de753b4243f417397738473d091fd14776c21da0dbaa0b40c2b465cde5910a6
-EBUILD errorcall-eq-instance-0.3.0.ebuild 665 BLAKE2B 21fb376a71ac9778191dd03fdd15bea33f8a820c853935a120ff6dc642074066bcc797578cd6a0a3f077aa768d15c9fb6ee3b231a53c980ce0018ba90e511719 SHA512 5c7441bca2880e157fea30c3a4683545dbb2b5de30631d20a166283f751b2c5364293a0a608c633cdca9ce818bdcc8f22cfdb141535446f7dec0102d97eb0925
-MISC metadata.xml 403 BLAKE2B d91f6c24dcbadbd55fc00ce8c51fa9df861b025124d679850dd10e79c9ae8676d2a58c194791743c8c16893be9562674e5e112ea7672b4579d3e2804864205b0 SHA512 2db46308a0fb8d443c6369bb1275709cb975a0900552d0d0752c8bc6e689929d4e666428903aa914129f2cb8f493d379786adbcc38f4813e7b31aebc5cff6277
+EBUILD errorcall-eq-instance-0.3.0.ebuild 665 BLAKE2B 42a2c8c73b4d75a35ce15bef547b1d0cd614299f7e62df9b8ddb797f6a3a233f9dce332858fe5e607fe46b4aa5e87ad0066a127a6c35b6fa187bce25e062abb4 SHA512 c6e2d2ab884191d7fcc927254862dbc2b9993fd5624a519b75dd91708995ec01cacaee9b0468c2e059ec546cbd60dba67f62bc3d4d7ae6862e85c6e302bf2a90
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
index 575eb95d3ba6..e63ef2b19c3e 100644
--- a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
+++ b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
@@ -1,9 +1,9 @@
 # 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.6.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/errorcall-eq-instance/metadata.xml b/dev-haskell/errorcall-eq-instance/metadata.xml
index 0dc85cfde05d..b7878815d80d 100644
--- a/dev-haskell/errorcall-eq-instance/metadata.xml
+++ b/dev-haskell/errorcall-eq-instance/metadata.xml
@@ -5,8 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Prior to @base-4.7.0.0@ there was no @Eq@ instance for
-		@ErrorCall@.  This package provides an orphan instance.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/extensible-exceptions/Manifest b/dev-haskell/extensible-exceptions/Manifest
index a51fefba07aa..96bd7e02a458 100644
--- a/dev-haskell/extensible-exceptions/Manifest
+++ b/dev-haskell/extensible-exceptions/Manifest
@@ -1,3 +1,3 @@
 DIST extensible-exceptions-0.1.1.4.tar.gz 8531 BLAKE2B 2156f9c719737286d720bd52e57172386639c95f559e8e4a257ee7f67e61a9948ab042d8befd72b3aa15993faeed6bd7ef2918553d47e0c819c2a29262289cc2 SHA512 b63bb6b8bc846571db37c23801b711748a10a27a6a6b25035e992013f6705ad9b3ad86e61a7de839c9ac61c26ad3640b9642a8747d6b76a03336834c39e93dca
-EBUILD extensible-exceptions-0.1.1.4.ebuild 683 BLAKE2B d2df9d54e929e526f95a22de679c126e7575249aa480c99eaf28eef200bb7057ee602fa8076eb671ef64343602af3466fd392fa1eacdd2b6db903f7a37f03d6d SHA512 58482fa87e4fa5947ff09d21b25e93512e854178c885c862a8b00f3a1d17e33cfb067aaba64182b7b776134431e9d705d14bce294441c8cc92f1cd2733954de2
+EBUILD extensible-exceptions-0.1.1.4.ebuild 683 BLAKE2B cfe9dbe51342001fdc0779e877160f1e69de3cdbc8485dab7f8a76318fb69ac67c8d0e8be8fa2e2a59688d38fde76f8476ecf496452f38c86d92c2c7d51eb68f SHA512 54162ac0bcd85b82c568976aaa471576f35041339766ba3604cb2f5b5f8340b26a552bb2c1d83560f2429d2620f5c6f71d7bea81809f50dd0a828c57d6f018bc
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
index b92a92af0dba..ae922f958a10 100644
--- a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
+++ b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
@@ -1,9 +1,9 @@
 # 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.3.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,8 +17,10 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2.3"
+	>=dev-haskell/cabal-1.2
+"
 
 CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1 7.4.2"
diff --git a/dev-haskell/fail/Manifest b/dev-haskell/fail/Manifest
index b43456300121..3f910d20d2a3 100644
--- a/dev-haskell/fail/Manifest
+++ b/dev-haskell/fail/Manifest
@@ -1,3 +1,3 @@
 DIST fail-4.9.0.0.tar.gz 2416 BLAKE2B cad36efcb3b93245dd3f90643694d85e6797fce5ee1866c6e8691d9b2845774846b99a7436f854c26daec985f07a9700fe4b2c1a467f2d33bd8a8fa0e6d3058b SHA512 0b4e6111387768482ff10b8ee55ff0b3b04750d8def057b7935bef814902de4536d0825e18b95a342722735b29cf88aafec21eb3b2a75eb4f0c55aa7c6b80108
-EBUILD fail-4.9.0.0.ebuild 713 BLAKE2B 9395f4b2518bb0828d12cbdf7aadaf9e00c99c500e494eba143f9d1ce97728bb276984d86203234fae19a32e4479e4a809019cc063b452f1f45b4c00efcaf4a0 SHA512 81fc381641162ebad33ffa98e1520ad7e38df863aabe5b660362385077ccbb26ef24b025c56758393ea2dff4088c88195025291a2fccf78b256d92a5da9ad27e
+EBUILD fail-4.9.0.0.ebuild 713 BLAKE2B e009a7c2280c614a4fa19e4944ce36439fc6c204be955392444e2ae7440a2709589bda5bfd2a59e27cc74a77ddc65e0c12815e25705b31fe3e61728118714c97 SHA512 7f91a97f6eaa0695115112bd04b2ead31700525c399c62fa46defb36756c062d7b8ee77d3ace7664189d04e3956dc0fbca2213b1b7a624839a40c3f9bd37a35e
 MISC metadata.xml 802 BLAKE2B 3233af197b69239c6cec5f3711c9b6ef976fc3a71251298515866d786afb360c02bed95e4d0b614828f91b2fce9ae496c72072423468fba2453f898c95f7f141 SHA512 45b162d2aafda8927d5fd066b5db9340830998aae3093717910e5d39863c329060741e7318312c5f26c0115dd0b583fe77c89a82eca7ad15ac54013be29835c4
diff --git a/dev-haskell/fail/fail-4.9.0.0.ebuild b/dev-haskell/fail/fail-4.9.0.0.ebuild
index f5bb54330f1d..1b3b9b74b71f 100644
--- a/dev-haskell/fail/fail-4.9.0.0.ebuild
+++ b/dev-haskell/fail/fail-4.9.0.0.ebuild
@@ -1,7 +1,7 @@
 # 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.7.9999
 
diff --git a/dev-haskell/failure/Manifest b/dev-haskell/failure/Manifest
index 1ad76206e1b4..ce4ef5cc7ffc 100644
--- a/dev-haskell/failure/Manifest
+++ b/dev-haskell/failure/Manifest
@@ -1,3 +1,3 @@
 DIST failure-0.2.0.3.tar.gz 1797 BLAKE2B a25a3276cdd8c5f68be61effb2f65a94fe1ebe612e1aecc3d6dd697e998fb60f81d9e07dfe1e5b57c79da7111a442ac648af4bf55128340350eb1acf3e7088be SHA512 ef8c9904d899381a281ee79235054af6bd156d2b2819e70bcd2a122c1c505c10311189f9280c39bd836c0f3ba35bc7536ce83b58a42978616ebd89c64d692c96
-EBUILD failure-0.2.0.3.ebuild 617 BLAKE2B 933e9821b2fa102574d7b6b696ee2d84154d09de5da85760050eca286f5af24a7452738fb8a5935d4f4f103a26a53af4342eff1baf8442812176fd29a6ba4bcf SHA512 86b3750244c98f1ed0cce9afb112d0c59ce41af55295fc032ca903e100a7a205fe257606ee8b2a4cce66baf2a6f5e05a58c4f6a55206ef0501ee7c5f5da85852
+EBUILD failure-0.2.0.3.ebuild 578 BLAKE2B 5f80cb3da95b609f9890446057f1af717592a03b7703a6223af4934244b072120b9de9f7af3ab36d98068f4008637c619756d179b1388657bfb5564779a910e9 SHA512 5646089b51081e523f9dcae3884842cdbe554f7b0e762bc796592bbc31ae045b79323e2619990c3490e2d295e9750cc1c05779fea882443577d9fb8282907bb2
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/failure/failure-0.2.0.3.ebuild b/dev-haskell/failure/failure-0.2.0.3.ebuild
index 93077d2a61c2..aab5f36c3771 100644
--- a/dev-haskell/failure/failure-0.2.0.3.ebuild
+++ b/dev-haskell/failure/failure-0.2.0.3.ebuild
@@ -1,9 +1,9 @@
 # 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.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,9 +17,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+RDEPEND=">=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/fdo-notify/Manifest b/dev-haskell/fdo-notify/Manifest
index a2879a51cf20..65d7cc97ba55 100644
--- a/dev-haskell/fdo-notify/Manifest
+++ b/dev-haskell/fdo-notify/Manifest
@@ -1,3 +1,3 @@
 DIST fdo-notify-0.3.1.tar.gz 4882 BLAKE2B 9ebf5bed4b17601b4deabc523e1ad529b95856ff6c0e6e83966fdee0373a37f8432c0fa34a6322157da1b3a93b12d10de2ff97da83c8ab9b2659932050083757 SHA512 d9193899d5eebd7c36e9464571827bd5b560fcc156e89822877b3b67a1f376c7abea9958f7e0aa6f79da06ad5f35a8738ad30a40d447b64ad557ed341054e6b6
-EBUILD fdo-notify-0.3.1.ebuild 579 BLAKE2B 17d90bd17e3512b9b94491507a57b17f0eb2a84c966acaeae39ba34151d6fd09285d28d228c397ba633558e9df004e504557fe8854197ff90a006fe2bbdc5fe1 SHA512 dffa714da506c990b427f9a3b97ceff234751c322ae9e77e916baa29d9e4900a53065d229bc10f60fa58c1a698cf96cc8adfab77c3cece9382eb3e7cf09f83b5
-MISC metadata.xml 452 BLAKE2B f4d0c3fa79053d9a7b444dd7bf4dc37310f5891eba6005c5babefa183f10d5e4328008fe4f15bcdc7eca191fc9d786e258a4a5b1ec6b7e874ecfd031d655108c SHA512 6cbe7ad76497cbd43328a240d6dc2328bc864c302925533b2fecbdcf79908e83f6cfc7906b7bb556e46677c0b7825998fecf7edba24517bbf6c3d0b67ecf8dad
+EBUILD fdo-notify-0.3.1.ebuild 569 BLAKE2B 0cd793a514c3c2d242b33243e3857c3c20ec0f1177d6a40c67aee2be944a4514c3efd81607c054cb2efc6da29e9ea6101faca65e1793fd2b0882fcc8ddad7039 SHA512 bad84f591bfbc7fb137d62af45f0d7230519d95264f22f29ad57809aeeb0e7f98ed350f84bcfb1bcf5669f9483797244cb1058531a2fc6db1d21e82521b953b3
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild b/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
index 3d94cc7eb01d..4bca228c937b 100644
--- a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
+++ b/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
@@ -1,15 +1,15 @@
 # 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.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Desktop Notifications client"
-HOMEPAGE="https://hackage.haskell.org/package/fdo-notify"
+HOMEPAGE="http://bitbucket.org/taejo/fdo-notify/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -21,5 +21,5 @@ RDEPEND=">=dev-haskell/dbus-0.10.7:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.1
+	>=dev-haskell/cabal-1.2
 "
diff --git a/dev-haskell/fdo-notify/metadata.xml b/dev-haskell/fdo-notify/metadata.xml
index cc48e3a1090d..b7878815d80d 100644
--- a/dev-haskell/fdo-notify/metadata.xml
+++ b/dev-haskell/fdo-notify/metadata.xml
@@ -5,9 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A library for issuing notifications using FreeDesktop.org's Desktop
-		Notifications protcol. This protocol is supported by services such
-		as Ubuntu's NotifyOSD.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/filemanip/Manifest b/dev-haskell/filemanip/Manifest
index c9013605d8ea..63d42896eb7c 100644
--- a/dev-haskell/filemanip/Manifest
+++ b/dev-haskell/filemanip/Manifest
@@ -1,3 +1,3 @@
 DIST filemanip-0.3.6.3.tar.gz 10369 BLAKE2B 19f68d3c130ff5d2f40cae100eeee4ae079d86c0d23138e44b7f22d07584c941a8a0ad8cddb04b474a86729872699ac72991a0dcf6c9807377a761570138710c SHA512 5cb6ad4e310c1ae3b038ccfa3154536db73145e4dea4a7be1ae0563ba44565494e378fa8e459f449feac2bcc140f1128b0b3ec915acd2300e73cf012ada85160
-EBUILD filemanip-0.3.6.3.ebuild 611 BLAKE2B 2c7e2cf97d6c95c9887739db5f0c419ae2435bb829abf122f684dbf3478c430222c2e622de7f147949308d17318d2acf7aa50e9907159424b50a4ecbba898b03 SHA512 092677e6e8f9f5da27b53623931de05cec43b1b1e7fea832980052494a36dbec1651b180931992e46df0d2bfa93c6c272a330b67d1fdc24d0550f71798c10f74
-MISC metadata.xml 516 BLAKE2B 61b30369e5a46af92e588ac196e00822cef6919e4cce101a204045280e5311b3e0b2475755e2778a7d2fe7f1ee39852e50e9d54ceb67b9cc8b0fec32cfae566a SHA512 6dc2a8084fd770c5e6da7536c09dcba528b8db906acf39d49ba91bf34cdb3eaca72cc6127d8ff1b9e0d938c27e07382fc4c57b65732829ecf3414c423f7d00b3
+EBUILD filemanip-0.3.6.3.ebuild 616 BLAKE2B 8cbcc714aa109788594b32f7ab52d03adfc2e7728a0c4e8f96484c64d796f23f9c2482994eec6dd31ab57baf248e6f9ec7064e723522afd3063b7ef5fe697450 SHA512 60eed7acf4121d1155b7407529f248da610958efcacc6e957a86815713d60905f57aec4beeed6b6c658c04baa9628705b22f5cca3c55598beb921eb10d815006
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild b/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
index 5a2a2c084f9f..bc5f91a4df5e 100644
--- a/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
+++ b/dev-haskell/filemanip/filemanip-0.3.6.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=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.3
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/filemanip/metadata.xml b/dev-haskell/filemanip/metadata.xml
index 445e6f97d517..b7878815d80d 100644
--- a/dev-haskell/filemanip/metadata.xml
+++ b/dev-haskell/filemanip/metadata.xml
@@ -5,12 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A Haskell library for working with files and directories.
-		Includes code for pattern matching, finding files,
-		modifying file contents, and more.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/filemanip</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/findbin/Manifest b/dev-haskell/findbin/Manifest
index 4d53ce756306..495b6b5d6ea1 100644
--- a/dev-haskell/findbin/Manifest
+++ b/dev-haskell/findbin/Manifest
@@ -1,3 +1,3 @@
 DIST FindBin-0.0.5.tar.gz 2277 BLAKE2B e63fb63739f1418d43fabd919276e9b4fe4ba91e2b8d961df232e824443d0f39ab7dc9ef55f4628f22216e312f1d7a8e81a6d8bb9f748fce8ba17ea6880eadf9 SHA512 427eff520ea9b88bc928d4330d4550d1d7d2254512e63cc8afad5f45b94a58cf4758a704db5b8ca4dd33f5bfced6557965192bd41d621a33eecc0c517548fa9a
-EBUILD findbin-0.0.5-r1.ebuild 601 BLAKE2B b6154d3824672c5c771def1e33604d3cd00abda9ae7498841d7326086f904b174a6e39aefbac6a3e5e2fac174ff430659be4856ae53b39dfe0d9b7837e33f271 SHA512 3610b4737d94ab5dd35bd219b0bf5d9b57f580fc3e54bfbf77c511939d8fb336ca190519a3381322c98308d4375ad7c1505f1ab84ad9c33d46cb8cb383b06b54
-MISC metadata.xml 604 BLAKE2B cc6f08be08301d38a1d361d186e345df487482806e3e3686f92f8b078d650524efa4e4c81308e2e19c2ce22d750975e5e39685ef1dde0975223600b2cc725a84 SHA512 b67a98cde7a83d63a13c7b3760866638a35cd115c8157d373d0a38dfe30fa9f52d1204f7fd28abeb62ba3c991fe86438aab8b2c8511eb429fe39c35f3a7a8ae3
+EBUILD findbin-0.0.5-r1.ebuild 603 BLAKE2B 267ce50991e8ed9500f017b9a0a0a5abb58f8ca54b0e70a15096c4cf89b71f38cea69d304575beb97d8e3752ac2428cb4cf566e73967883df30ee066cb66418c SHA512 256a9d8c77607846f2e17bbc336bd71ffb2ac7c3e98e3849f12c7c5778ba45210f7c2cd8636672a1497187c53f718f4b23a569fcf1550cd78a696faf56eff1f8
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/findbin/findbin-0.0.5-r1.ebuild b/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
index b946e0abd6f1..10f4eebd39b7 100644
--- a/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
+++ b/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
@@ -1,9 +1,9 @@
 # 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.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -20,8 +20,10 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
+	>=dev-haskell/cabal-1.0
+"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/findbin/metadata.xml b/dev-haskell/findbin/metadata.xml
index 10897c810b1a..b7878815d80d 100644
--- a/dev-haskell/findbin/metadata.xml
+++ b/dev-haskell/findbin/metadata.xml
@@ -5,13 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This module locates the full directory to the running program,
-		to allow the use of paths relative to it.
-		FindBin supports invocation of Haskell programs via "ghci",
-		via "runhaskell/runghc", as well as compiled as an executable.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">audreyt/findbin</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/fixed/Manifest b/dev-haskell/fixed/Manifest
index 34ca64ae8024..c14e79153a7b 100644
--- a/dev-haskell/fixed/Manifest
+++ b/dev-haskell/fixed/Manifest
@@ -1,3 +1,3 @@
-DIST fixed-0.2.1.1.tar.gz 4346 BLAKE2B 9821b0a7a14b338f964cce55699fbd31c1802334f6d9b8d0717e1d673d284a503e01b91328bdf307f1429ddbdd8c7a6ec3395bfbe465d6af531bfa5e27daf20b SHA512 99f0410deffbecaf4ffb15543e3fd060cc679b238644490cbb0a608dda9957fc4c0020bce667f6ca25fc02c52fced7e9ca40dabe899ec8649b522fdec75eb9c0
-EBUILD fixed-0.2.1.1.ebuild 545 BLAKE2B 247b20707bc137983bef6d914cc29671f7f89597374a5e14c536bd1346705bcfdbc91687979746ae48730acb30a925492b401b5e02fdfb1af1c6296081e58c59 SHA512 80f2c20029768597ba97060ead32b07ffca683e505dd0a348a49b7d489fd44b4ddc4c31dc2bdfc7f96a594815f484fadc33e0da2c6e2f10d0b31bdf208377047
-MISC metadata.xml 326 BLAKE2B 2129580f78d8f84ec90a0805a5832df795379cdd4efc38afe80147f8f99ca64b9a0e6230d662f0a7b40248f8a4caf79c0b8aa6ad31263fc94ba9d98cc0ecaa86 SHA512 5badeb0662458afb4ac7c384e1b8af7f2de897520f82c80b6e23f4cc72fcbbc5f34500ab3f1447bde178ff1dfc73d29c37288c943fc06330514ceb61a1ee4a27
+DIST fixed-0.3.tar.gz 4384 BLAKE2B 403f0315b45fcd7519d47a34e62b99b77eabc683bbb650b6fc66d3366d6160bbd86cb58723cc309dcce14cc1f96260df8e38ea32876754e528f2d4c66a066e09 SHA512 f7a87aa63105acf33790f022ae1f1d8201febbfeb90f8c14f05c081899614db74adbe8abbfe144fe374316a1f4d9b84bf9b091d3bbc21b0e2c8f2f33376ffefa
+EBUILD fixed-0.3.ebuild 545 BLAKE2B 22d034492ae3b1645b913b61c891bdccfaa52a676c1e836913451bb96b90dd781f7444685353dfbdc81de164be408b47a09d98eadd3bbb290a435694e343329b SHA512 a32c9c25ee4d76e01189a2014b2a17706deeae52446fd2a653bd3c92442038616536f98d027c0494e89d7bd6b95c374635a5b798c055af71d1e9d9a43d024efc
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/fixed/fixed-0.2.1.1.ebuild b/dev-haskell/fixed/fixed-0.3.ebuild
index 6276f3ccc33a..8fdf2de68e36 100644
--- a/dev-haskell/fixed/fixed-0.2.1.1.ebuild
+++ b/dev-haskell/fixed/fixed-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=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.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/fixed/metadata.xml b/dev-haskell/fixed/metadata.xml
index 91dabf187f36..b7878815d80d 100644
--- a/dev-haskell/fixed/metadata.xml
+++ b/dev-haskell/fixed/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">ekmett/fixed</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/geniplate/Manifest b/dev-haskell/geniplate/Manifest
index dca11311b03e..1657acb8b12f 100644
--- a/dev-haskell/geniplate/Manifest
+++ b/dev-haskell/geniplate/Manifest
@@ -1,3 +1,3 @@
 DIST geniplate-0.6.0.5.tar.gz 7738 BLAKE2B e60c36ba553034400740c4b42828cb8e333331846ce719243761b9a4f8cd5a9875ee00856bf7cac1f03658392df920b9a41b2295d807f6926db1e80eba333232 SHA512 37127fa364ef0a8c67abbbadc025b932ddc62aaf09e4096548263c140b232b5442889d24f18fbb4ed3ea5eb0643b6afb4634b73471a2ec35b626dcd0c1781987
-EBUILD geniplate-0.6.0.5.ebuild 692 BLAKE2B 55764a7b119da624c44a27c52e4e4cc44b3c17b7553e84b6c6afa36fdb386235773ddb123730956686f697db42deb6924edfc59b810ac357ab9574b29ad0a36d SHA512 af72be1cbd9fb569a2eddbcce99c0b13c7a9d04d70aacc360c33f40187d3f66c85dcab0561de88e36d1b25f9ca1e18ba492fa537445ce62bb3e1a8cb44fa0ec8
+EBUILD geniplate-0.6.0.5.ebuild 686 BLAKE2B 08047ca898043359b88119e9eca1fc3edac66b64fcc9bf467d32329e72cbb231bc8417b415b757756280e30191bc2fbbb793293320ff1d60dcbfc553216b9510 SHA512 9670072c8385e09cd7339cb717504de8aac922bbc0dcedd37440b803b9251f168f404e585faefecd1d148fdf6b39145f3c955d45e03601b6cb836c8b79f379c1
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/geniplate/geniplate-0.6.0.5.ebuild b/dev-haskell/geniplate/geniplate-0.6.0.5.ebuild
index 466e84d75fa0..a9f1c0ab19fb 100644
--- a/dev-haskell/geniplate/geniplate-0.6.0.5.ebuild
+++ b/dev-haskell/geniplate/geniplate-0.6.0.5.ebuild
@@ -1,9 +1,9 @@
 # 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"
 inherit haskell-cabal
@@ -18,13 +18,15 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:= <dev-lang/ghc-8
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
 "
 
 src_prepare() {
+	default
+
 	cabal_chdeps \
 		'template-haskell < 2.10' 'template-haskell'
 }
diff --git a/dev-haskell/ghc-syb-utils/Manifest b/dev-haskell/ghc-syb-utils/Manifest
index 39cfcb26c926..3b4b975c7aa8 100644
--- a/dev-haskell/ghc-syb-utils/Manifest
+++ b/dev-haskell/ghc-syb-utils/Manifest
@@ -1,3 +1,3 @@
-DIST ghc-syb-utils-0.2.3.tar.gz 4689 BLAKE2B c1403610fd6e34e97d68a2ad5ca2c74adbdf1e16fa3605a6350469ec20187aa0db90f8fb0484f7c1c60a4440310796c23d017433bad690ad71ac840915085efb SHA512 af311d21396c1f7e98c532b1192d2aad27a942f66f4e09eea4cb0d6c1fe444a49c4e14ce4030504f544c796818a887e1ce6bf828cbd28c69c1123e224793cd32
-EBUILD ghc-syb-utils-0.2.3.ebuild 584 BLAKE2B ef5bc14009a42fbab015c24e6c6c827db0c6653f5e10f43a450d49f79e5ac47e9e172546bfe170e92e65e04fe3e23432261334b7878ab0780420312b9c562159 SHA512 7f4d1c33149dfc7ad85e47e7fe7a119951ca094582027bd6324d901242ef88568a109f48abaea2460d79b5ac2b2232cd309f1d67f73da1f9b8e0679e81ea9a70
-MISC metadata.xml 330 BLAKE2B f402df97dd16528bcd47264d98e2b0fe72a65c59d65baf9efd463caaf8322ea7a8d2dfcc281082bc68fde0d369a6bd25896a2f55848228d266222c5c5b5eafd4 SHA512 60df53bfd8c0580ca6f726cf377d0c3ed96d9b33f4d3c3b31b4bfcd7807eb88d0a72a7d0e6482dfe0d3bb1ebc1e18b5aba19c9d2e500ad33c009d977e0875ee4
+DIST ghc-syb-utils-0.3.0.0.tar.gz 2895 BLAKE2B 26ee12941b9cf2a4295ef2ad2db87f918afaa25fbb781d918955d8c37a63e41295a6c4a62b9ea769803313ccb4fe20704788e0b5804922c18e8193c2abf97868 SHA512 e55cc7e830d34113eae55f89124f836390c6c8a80afce9f1b245aebc35acf1863beb9f7f0388fb22e4d1ee771c332da8f9b36d88fd89080ac50d287b2272aa3b
+EBUILD ghc-syb-utils-0.3.0.0.ebuild 584 BLAKE2B e7da77b316eea4193b488d63bffe1ca8f482772f044a12e4f0c5907725338252457c99079c89408a9b4a781eff7e5e7edc1b32095c17edd488a2790046c414a4 SHA512 1ed72d3c539dde905e95afe92a2c0d95255e064ee42140bf234f73a84e85e98d6ea355896a9ac1320048fb97282cc28e8a44c890e6a40ca153f62f670f7aafba
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.2.3.ebuild b/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.3.0.0.ebuild
index 1bc6d6a5b89b..8f362de4d4fd 100644
--- a/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.2.3.ebuild
+++ b/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.3.0.0.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.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Scrap Your Boilerplate utilities for the GHC API"
-HOMEPAGE="https://github.com/nominolo/ghc-syb"
+HOMEPAGE="https://github.com/DanielG/ghc-syb"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -21,5 +21,5 @@ RDEPEND=">=dev-haskell/syb-0.1.0:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
+	>=dev-haskell/cabal-1.10
 "
diff --git a/dev-haskell/ghc-syb-utils/metadata.xml b/dev-haskell/ghc-syb-utils/metadata.xml
index c0e1747371d6..b7878815d80d 100644
--- a/dev-haskell/ghc-syb-utils/metadata.xml
+++ b/dev-haskell/ghc-syb-utils/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">nominolo/ghc-syb</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/gnuidn/Manifest b/dev-haskell/gnuidn/Manifest
index 4b856a1d9da3..227f13f189e9 100644
--- a/dev-haskell/gnuidn/Manifest
+++ b/dev-haskell/gnuidn/Manifest
@@ -1,3 +1,3 @@
 DIST gnuidn-0.2.2.tar.gz 17534 BLAKE2B e6f152145bc7626dfa9757477970d6cd6066d47350d7ccb25c99ecc8b33406c54634cbf6829ab08c5d8fc7987277e110429899436c7b99d71aafef0ac496dbb7 SHA512 4ac894ba4cc4fb9fd90ccea55fda342cd0dadc863a091d31287b19117ec1e545a23b7fb69db02bbb8ee9eb84856acb51f3ab0d7778f4ca3da290dfcbc7ef27ac
-EBUILD gnuidn-0.2.2-r1.ebuild 690 BLAKE2B 8cce1bef6ecde7a623e482fc48ddc072c60058fd12efcd3db91093c068dfd1b25184ef8593a206a948c0139704017bf6fe04685212e654879f70b917c96a3f24 SHA512 742e880f6bcb12e0a7e23a878d402cfb88af5bc3b5f46791541544a008606487e89cfc5df79887c72a82a8184eeed8e99c01984ce5c9eaf799ccc64bda6a86de
+EBUILD gnuidn-0.2.2-r1.ebuild 690 BLAKE2B f50a57bda1587030e07218142a1fccc40a98388724f2cac18c4d54fb634977b1241f9bc662d1ff13040ecfb9340cd26aaa152089366ad791e6e8ce8eeb2baab9 SHA512 53f4d17aff6abb27464e9236392ade5487a63b7752001bc5faba0adc1d1d0bfc27f24028d37dd8925a584b46829cf148dd4b7e569e0b8ab98b97651d4855bdb8
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild b/dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild
index d5bd3de599cc..93d7582be2c1 100644
--- a/dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild
+++ b/dev-haskell/gnuidn/gnuidn-0.2.2-r1.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.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: uses dev-haskell/chell-quickcheck
 inherit haskell-cabal
diff --git a/dev-haskell/gnutls/Manifest b/dev-haskell/gnutls/Manifest
index 0aae0ee40f84..2f9511ab01b5 100644
--- a/dev-haskell/gnutls/Manifest
+++ b/dev-haskell/gnutls/Manifest
@@ -1,3 +1,3 @@
 DIST gnutls-0.2.tar.gz 17272 BLAKE2B 2412f9a5f7a74054317f6f4c54c5813a897976da2e48a534a5a12557f04766dad680638e6f61071e9721d84ec1a4ff02b72dbf531ed392b1be6c0b5280919092 SHA512 9b5e3083fae30e4ac8584c825ed1f1c07b24136ca6d30c627f17d1c7793a515a091919784791b3a5bcd05038d8d43419802e036cefe8525efac9ee3f9ebf9e8b
-EBUILD gnutls-0.2.ebuild 704 BLAKE2B be7b15e6fd1bfdcf7f1f05bddbe260f79d334fd9f2b6b47a0cd8d326efb335560451429f5dd0b53455a039cd22a6939fd4fd8b696143f6fd233abab4adce89cc SHA512 5993cd6723c87f38e8fddc3bee262d518c0bb3f40af08c98c20f5950f1882ec215ba9091868149283eb83c6fc18ccf5b100ef4fba7c8712006cf4e71519a3c18
-MISC metadata.xml 545 BLAKE2B ffac5cf312728e343b1f48d3be0af9bbb6c6737b3c0f82cc752a78b8f22822c1d58bfc28ee3a186d3de51d0af51ddf51ca053b6e0c7eec1e328cbd681b60cf85 SHA512 42bd7ea30a8ad09a9d9b4212430808823dfb4470537bcfb7dc1b63d32008e214ef06ac400485f4268028b3e6bb9b3b8252e073ba13b30294f81d86d721eac692
+EBUILD gnutls-0.2.ebuild 665 BLAKE2B 9c6d8beb87d8a71ddd234ec4d0764e6da97d7903932e6731f1d2d44abe6bdb8c73dd11f8ccd873af1f58dd1076df52a9d1bcf74f27dd316189a84e2058c591f1 SHA512 377af543b25ef0e616af76ab35b7e584b40423cfaef191188ccfbb178ece1d8b096ec4ea53e1fe93808e988cb2185b0b0ac882cd2f34abb87da68e30ce9b396b
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/gnutls/gnutls-0.2.ebuild b/dev-haskell/gnutls/gnutls-0.2.ebuild
index b4f07fc9a556..d685017611ca 100644
--- a/dev-haskell/gnutls/gnutls-0.2.ebuild
+++ b/dev-haskell/gnutls/gnutls-0.2.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.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -18,11 +18,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.8.2:=
 	net-libs/gnutls:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
+	>=dev-haskell/cabal-1.18.1.3
 	virtual/pkgconfig
 "
diff --git a/dev-haskell/gnutls/metadata.xml b/dev-haskell/gnutls/metadata.xml
index 85d7c5520de5..b7878815d80d 100644
--- a/dev-haskell/gnutls/metadata.xml
+++ b/dev-haskell/gnutls/metadata.xml
@@ -5,11 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		You almost certainly don't want to depend on this release.
-		
-		This is a pre-alpha, almost useless release; its only purpose is to enable
-		TLS support in some of my other libraries. More complete bindings for GNU TLS
-		will be released at a later date.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/groupoids/Manifest b/dev-haskell/groupoids/Manifest
index df3c5820a319..a006ca4308cc 100644
--- a/dev-haskell/groupoids/Manifest
+++ b/dev-haskell/groupoids/Manifest
@@ -1,3 +1,3 @@
 DIST groupoids-4.0.tar.gz 2414 BLAKE2B 0576f3c2eb9b5a097805c6db25889a264205029ed67cf9de8769305e4f89b6880ddd1073ba6126eb5340366762e6820d7e759a21be76c34d74db0abab378a266 SHA512 d0aacc582a1d03ab42ce900992e9f9c3cec47da653c5a472934361c5656cbad6b81b18065cf3968ccc6c4d8f239329f7f0213745d2b0d78e2c74ad3d59bec289
-EBUILD groupoids-4.0.ebuild 579 BLAKE2B 3b01153f51da8bcc3f9f362e0fe33b8077b2d7b42fc7183e0ae06492fbf432e0fdda9b96ae8cd62938d595ee3b72514f1f10de865abeb6b17126b1606e540cd1 SHA512 3c675f8806030728b5446e7f984a9f16be1ed7909de3b558dde5c79b486acf77ce53a752142e316c5d811fb8bdd627cec8e2bd496573b531d87e45e6838e9503
-MISC metadata.xml 330 BLAKE2B e1c5c856282a3cb002626b2727d3c7201a1f4d75f95d965ec0ef157dddccf19aed646508744adf57ad937b424d22c62916be3d42fe59c71c2de4c281c1eac43a SHA512 28f7b8a676b5a0f63258728c7f65fad55d1be345dc760d804c0d7d15db4d7edd9385c4f9ad6b3081e8aa2553e6616d776c15fa82308d03ca58bfd52231cf1cc6
+EBUILD groupoids-4.0.ebuild 598 BLAKE2B 03839065c154d2119c10323bc14302f552367d9dc467208dc642ef65b829d2071f2e893fce42ca01d3ac92e3a94e6706b57d3089f155d7b4ff4f8a2b489923c6 SHA512 924d6367f4fc5f3e254685a879b588e0f7dd0fac4b4982e5b3dbf37860e1cde9cf91e7dc0fbe0d77e1ffed01a6f798b69d6f1d650bf50023af346ddae0406bec
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/groupoids/groupoids-4.0.ebuild b/dev-haskell/groupoids/groupoids-4.0.ebuild
index 84a72c93f9cb..967646e97878 100644
--- a/dev-haskell/groupoids/groupoids-4.0.ebuild
+++ b/dev-haskell/groupoids/groupoids-4.0.ebuild
@@ -1,11 +1,11 @@
-# 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.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="lib profile"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="This package has been absorbed into semigroupoids 4.0"
@@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/semigroupoids-4.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
+	>=dev-haskell/cabal-1.6
 "
diff --git a/dev-haskell/groupoids/metadata.xml b/dev-haskell/groupoids/metadata.xml
index c729f81dc55b..b7878815d80d 100644
--- a/dev-haskell/groupoids/metadata.xml
+++ b/dev-haskell/groupoids/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">ekmett/groupoids</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/gsasl/Manifest b/dev-haskell/gsasl/Manifest
index b1fc9be88751..0fac41e621aa 100644
--- a/dev-haskell/gsasl/Manifest
+++ b/dev-haskell/gsasl/Manifest
@@ -1,3 +1,3 @@
-DIST gsasl-0.3.6.tar.gz 20170 BLAKE2B b9b4e18a3e19ebccec6889b1767fd415920b23c083fc96c835aa1d3a9e0598c295f794ca897dd97f19a02bfe7d4c1ebe6986f1a27805424d4668d29a1b1d3b2d SHA512 657b3154d32d5c40eca79fa8cc0fd7f2dfce2d5d934f0388e3a16db15d513b18f5a25479b9f71ee164f999de9748f83e63f0334f43ef31def944c987e7186122
-EBUILD gsasl-0.3.6.ebuild 618 BLAKE2B f106429c3750afc5144f5065c4d414fb6ec6e0f3ecc7bce6338ee1ba47765304c452d72d65533c14eacddf13d4b57229e25f23b2d673e7f62f6b1acb7684431c SHA512 8dee6540a4050a8397c3daf95065a12f589e3052144bcb1fb82646617c48ff2a0da153f17a7738b387e9b38c60ecb450ef4de052908ee34f22fd55c73f743c8c
+DIST gsasl-0.3.7.tar.gz 20184 BLAKE2B 77822255e11d8662a8b4316fa0456bb057ad250b2c823c28d79987f336872bba19596c8062cb0870a4222d68e0f862395835f53fda2a4db30c36e46f6fe595ff SHA512 7a3eb2919aee0df650cfeec62fb6cafd4cc49a9af59c54878a737816b6369cf6d63db7e8afc701c44c74ae15a46a707a20a762f7f976f8a8c1803f1f9db59ed7
+EBUILD gsasl-0.3.7.ebuild 616 BLAKE2B 273f4ad3a6e85001159ec02c203a10770c550096c4f7ba17467d9c75d85326c9114a3bbe575e66e916395391c9ec7000f83f33eed8f784912a9cbe50bb130084 SHA512 95b8efc22931904133bbcc19b55eab82445d802f770b8a157aecb906a3c62b46e87b319dca75f675fa6cf8da4ffb4b642c962c18670d222983e5fd3fa53ab364
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/gsasl/gsasl-0.3.6.ebuild b/dev-haskell/gsasl/gsasl-0.3.7.ebuild
index d17a2682fd88..784abcff2d99 100644
--- a/dev-haskell/gsasl/gsasl-0.3.6.ebuild
+++ b/dev-haskell/gsasl/gsasl-0.3.7.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.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Bindings for GNU libgsasl"
-HOMEPAGE="https://john-millikin.com/software/haskell-gsasl/"
+HOMEPAGE="https://git.sr.ht/~singpolyma/gsasl-haskell"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-3"
@@ -17,11 +17,11 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-haskell/monad-loops-0.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
 	virtual/gsasl
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
+	>=dev-haskell/cabal-1.18.1.3
 	virtual/pkgconfig
 "
diff --git a/dev-haskell/haddock-api/Manifest b/dev-haskell/haddock-api/Manifest
index 7ca59b96c811..1c2e6dd453b3 100644
--- a/dev-haskell/haddock-api/Manifest
+++ b/dev-haskell/haddock-api/Manifest
@@ -2,7 +2,7 @@ AUX haddock-api-2.17.3-ghc-8.0.2_rc1.patch 747 BLAKE2B 743b22c933a793ed5006664ff
 DIST haddock-api-2.16.1.tar.gz 125372 BLAKE2B dbc0678cd38bad8549375468ddda27061e17cb74927e1a1c3c286cb25e8cd098a8f17333d199897bcd7ee56553b4d68b206a6935c44b0a5056810921fc6a3b45 SHA512 01450602d238651a8711141d51f5246536a96b69efee29942296fdfc249929f5f33df24ee676b56d0ba82269cb6557dd3a4e8fabbd1b809e506867b5f285bb17
 DIST haddock-api-2.17.3.tar.gz 145142 BLAKE2B 1ca87c180baed23ec5df5d5cbfedc7e3823c344655b2d13f2bcbce0c774874223269b06a88f45365511f6789f8068086c04460faaf4eec7354a20bc18680ce26 SHA512 00057618d970fc7786913eec0b408baabbf1aff4b705c105f6d6347ae9c46af1b2ea7bed420edfaec38c835dee08593c9ae53ab9a30153239e687de6f5301840
 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.16.1.ebuild 837 BLAKE2B 5714c573a889ea1ab25d4348abac1c0ad4c090c4d0993d50ee7b43e09ea0e8a90fee5e20cf1b5ea36473f963d3933d41931eca20afa2d2b46f78e06347de022e SHA512 c72fb8c9e0e3d0ea5d021931ef7f50acf255b680218313f7c812b4ea812c8dd3d86cb7cb0a9e092f79a33aff5996f2484982267dcaf6f4c7d2b8b223b96e64cb
 EBUILD haddock-api-2.17.3.ebuild 1050 BLAKE2B fa65189aeb89200c0d55a4e30b29cda630d346ba3d6a6430a331f83515f73a626913080e02b6af7b9bfcd60ee9204cd548ed4da943128e4547e8e2fd760dc37a SHA512 1cdc9ddeda2cad2193975ebd504d2ebb1d319f6aaf0f0b3d10cd677b14880e7495eeeddf701820b34cc6d7f8b419ff63887b0dee099d15f687166ab3970f500a
 EBUILD haddock-api-2.23.1.ebuild 1087 BLAKE2B 937fb9b076c2081f74228d85f11366b937ebfcf450a04f8eccf0ce43b03a8c8c13657a4571a873db543b346c853658bee39c6706857e69342eea953b7e27cae5 SHA512 d795bc7254f46790f615b6a6d507ed8693c1cc84bab3fb143f5e9201d486d77459579705f22cb1e335a6dca6532621e10eeafddb0e5ca0721b5771f346834918
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild b/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild
index dc77c8343d80..eb3209d4acbb 100644
--- a/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild
+++ b/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild
@@ -1,7 +1,7 @@
 # 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
 
diff --git a/dev-haskell/haddock-library/Manifest b/dev-haskell/haddock-library/Manifest
index d175ba585cae..7f768b46ac93 100644
--- a/dev-haskell/haddock-library/Manifest
+++ b/dev-haskell/haddock-library/Manifest
@@ -2,8 +2,8 @@ DIST haddock-library-1.1.1.tar.gz 35641 BLAKE2B 1754ce1088c34629f8523a80c9ee1424
 DIST haddock-library-1.2.1.tar.gz 38606 BLAKE2B 1896a098a4858796feb9ded26914a7cfc9f6478f3993485a9c61be1a3b1aee1e32accafadaa5b1e030d17f78555b1f4c731b76c09bb83c7a7cb8132c8e25e792 SHA512 7ac9dfc648e6e59e1dbaafc7fdf26acb378997506c353dedadf89a729223cdb518edd59642e81758fd898cda163258e5e4150fc84369c3e011e59acd827a037a
 DIST haddock-library-1.4.2.tar.gz 38701 BLAKE2B 56c0f1c46100fcf8afa88ce8c44f989da9561109bf74473d5ef65962cc057cf7a54f87786171ad2f57895000e610663f1b2711f231adc7d85442e9028bd9729b SHA512 0ea02f4ac898e6d4349f3c8d3997d66c35866350bfd661b6030a0b59c609eaae3647c8898bb5142afb0235b2eb785059356f6eb2031e6e93615d1d4e3c4cce82
 DIST haddock-library-1.8.0.tar.gz 30918 BLAKE2B a8bcf9e08f6596375186930cf4a98ae547c40d85eb0bd00b7aaf8212c3738e32cd51cea044206f3746d10d228b1e8b8a2ccdb28ae7c7957006f518d090a6ceed SHA512 f84672b67dd4b18402efb8b40eb0e2cb912ecf894cfdedf61b0ada87392e63609cf1101d4fc793686cc4af354665661bf4dc902313bb466efee683a7c64bbe2b
-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.1.1.ebuild 664 BLAKE2B 94b5fb56dea2859cbd27f2bfdef9eba77b0e3c1d0e6085fda4d054788560c847748ab160585a02cd99de9b301d9a84483033c2e1feb9e806bf9ac7043e33ccdb SHA512 f455d52e5873b98bd051a4af099e01611f3dad910e48accfa786073b9723fe24c03c51d10c41e0483eddc52d08d80c12b0baf6957b744bd0bbabc0570e867242
+EBUILD haddock-library-1.2.1.ebuild 788 BLAKE2B 6689b94bc4291968a9b03d5778386e42a532537ce1a777a3f70f8befe1252c5e2933302c42ce1f5b3776f215a779bd8c3df078d13c488a72f3784f9217fae612 SHA512 385574c9cfd9106f5d815f438461c4a3cc0cb3fde763e8274757d6c05afa34b08824f779dc538d56df4e516e480459bdaa49148e4b2fc8af90a4297c04da45ea
 EBUILD haddock-library-1.4.2.ebuild 803 BLAKE2B c79dc51e3bb499e40127ead0cea5c873ea52442bae3b5c2b9d7e8837c5e7ed2db842a2bc52bd955e060c7d19d51c900d1cf7cbf1a849f71bfe8fe6ab0a87727f SHA512 9fa9237bd3befd6cbfee8b146cccf0e06327736ce985a2758813d38b1967bc36dc4a80273d373412fcbe38b5c060f51f3f7d3ea27cd79f21b0bd223c4da7c5cc
 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.1.1.ebuild b/dev-haskell/haddock-library/haddock-library-1.1.1.ebuild
index 45e613953d76..0bd4c0f1af69 100644
--- a/dev-haskell/haddock-library/haddock-library-1.1.1.ebuild
+++ b/dev-haskell/haddock-library/haddock-library-1.1.1.ebuild
@@ -1,7 +1,7 @@
 # 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.4.9999
 
diff --git a/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild b/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild
index 5d6d6a8321a6..b1001acdcbff 100644
--- a/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild
+++ b/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild
@@ -1,7 +1,7 @@
 # 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
 
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index d70f4562820b..75b1fc491097 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -2,8 +2,8 @@ DIST haddock-2.14.3.0.7.8.3.tar.gz 230282 BLAKE2B cb5336c72e0fa3036bf7ceaa202ff3
 DIST haddock-2.16.1.tar.gz 216323 BLAKE2B feddc77d8072dfafb4b06486f57db89a0136ed53644efb0336a26e6c3f31789cf57e302e7bbfbfb9af036a00cbf801c47398347bd664333f0a35debdf794ada3 SHA512 709af410f8746819c8c067f3549d79ba0ecaa312fb6b19acf670a9a3e4c94e94b8e546493e08293eceeb488bc0891a8ebe033a58411c4af935b445cd7f3014b8
 DIST haddock-2.17.2.tar.gz 245690 BLAKE2B dc6f646a5972add1a5ac0e2a2a4119df5f8f0604984f0fa3f828e72bca96f8ec98b09ce65de6bb94a2714c64680a79ae3dd49f60a27cbf5483cb71f239180c87 SHA512 f8f06abd3b231fae36b900d54a70107dcd6718bab7726ad7bd8392c9053700b96672cf9efa0854033a5c1473dcdf00c390f253bc244ff5f4d25e70dd76c8ea1d
 DIST haddock-2.23.1.tar.gz 302698 BLAKE2B 1dae0019ddc08c537aec2f0fa71f5bd1570db4061d22bf53f05aa0e211c3280d09c6a6481f704c34895e0bf70fd2b5ac95644dab23b05cc2b6fec59c845f86c5 SHA512 e69b3b5f2dcadeccc33696ee8d0646387860b98d86c08d4c07d829e3eabc4159adac0a11d408850ef54face5fa835ab8217d1057b14d8de8d758efbfc7a700db
-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.14.3.0.7.8.3.ebuild 2043 BLAKE2B a29324b23bef8dbe8c0b98c016b52fd03abed1fb4a98207da810fca269849f1477d5e1a714b03e8bd0740d722cd82ccdf80b56bfa71bacc477fd5557cc62bb5d SHA512 b621458d9f193609c91455ba10ec2f2739d02d615b6e5036810fc55b0857089b65738112b110fd8e1b9ce1dd7b7f3d73dc9b0eae6f6db915d8905ccee74d779a
+EBUILD haddock-2.16.1.ebuild 1929 BLAKE2B 425c9d7869257bb06c50187025028083c3ccb4951c1c01682b2ab3d941f1649362926092b1e8ab323545332011f22ee12e365f91179e1c7ae3ee41f634b98510 SHA512 72ea7e1422c97b5496f306b150a2b90751ac65c3886040b83f27014fa97c04315da2636a83dc97535e0fe62aad589f5aff059385ca249d472c040a94d5685516
 EBUILD haddock-2.17.2.ebuild 802 BLAKE2B 8498ed4ea1900e4e28c5a76977bc33c74010ebea30f9376230e1cc839e60df7fd9b7a972594f75b7050647f60220910280ca162a2266aad782cce89010a7b3b7 SHA512 c0291127f88ab1ae5134343eb2eea1fd7890efe128835e1f2208f44fc04b5b690ea7913eae4ae3784ee9ca9f56b94f40a903769318d9d83706f2c3667edf59a7
 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.14.3.0.7.8.3.ebuild b/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild
index 3e5a6f1536dc..c1349a930c8e 100644
--- a/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild
+++ b/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild
@@ -1,7 +1,7 @@
 # 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.3.6.9999
 
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	default
+
 	if [[ ! -e "${S}/html" ]]; then
 		ln -s resources/html "${S}/html" || die "Could not create symbolic link ${S}/html"
 	fi
diff --git a/dev-haskell/haddock/haddock-2.16.1.ebuild b/dev-haskell/haddock/haddock-2.16.1.ebuild
index f914d15c4c06..9e61f53b16b1 100644
--- a/dev-haskell/haddock/haddock-2.16.1.ebuild
+++ b/dev-haskell/haddock/haddock-2.16.1.ebuild
@@ -1,7 +1,7 @@
 # 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.4.9999
 
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	default
+
 	if [[ ! -e "${S}/html" ]]; then
 		ln -s resources/html "${S}/html" || die "Could not create symbolic link ${S}/html"
 	fi
diff --git a/dev-haskell/half/Manifest b/dev-haskell/half/Manifest
index f65cb2993cc5..908e6053462e 100644
--- a/dev-haskell/half/Manifest
+++ b/dev-haskell/half/Manifest
@@ -1,3 +1,3 @@
-DIST half-0.2.2.3.tar.gz 6050 BLAKE2B 79ff80c1935814e73384b18754b3f74341c59ef55fddc40f002e1ce1a0780f45cdcb9c50726461da105508176b591f75fda955edb86091d186947d6da187b5ef SHA512 1b341670d0aa8513bef63a9522884d7c4b71cf9af6420bc67f8aab34c906a96c0288d900106878f5de9902b259f35501d09ba0b9ad82e5a759405e615572d17e
-EBUILD half-0.2.2.3.ebuild 523 BLAKE2B 0f3bdd52d38bed25adc5170a5771691362894a896fe92357c418f1958baddd70365b69d084948b18421e122f55015f8bdebf3f859b003dfc7ed03d311b3a9e05 SHA512 8f8f4eb52083aec875ae0d38a3e35f4beb7b94488e6692ddbcafd1c9979d011f8784a61c5749e76f2fa0039b9abfd75b230b994467a581fba5ecfc3e5c4a0398
-MISC metadata.xml 325 BLAKE2B c055fab0c3344a24ee1b3d6fd9cb8ddf486641634807d0fd054d6bbed125b608b928ec682a1a458978dabad3d0bc8f364561bdfdc0f76f7002413601de400c8e SHA512 8a26ae2bdd4d52daca552ecd7625e69c4330783a0548aba067ffdeada7ca36b30ea30881ae5dbbcba43d65b85e1f2cbbc9e76d01bda2b90f75eb04dc82d4c560
+DIST half-0.3.tar.gz 7341 BLAKE2B d37dad7dbc36b894132b4fdd430280be5305acc2fb26b0a88c68e5ca9678f7608d2086154fb174bd453723a466c7b1e4bc2dd055d48aa28b1938d545218bd1df SHA512 576766a8d5ae767da3915541195b68ce9586ff7a4a83473364a9d73d44b147b8fec4ecc09dc071520dd422b092e6291348dd2af25454a779b9c62e02cef0964c
+EBUILD half-0.3-r1.ebuild 599 BLAKE2B 5349d12a240646736039dd974eee3d5f7ef5536ac09ee570b15623072e8a54a1d11a13b9dfe44b9476d2bf3b049a12ded15ebfc9c08ae7ec14ac098940f52c68 SHA512 6ff2115b3e9fb423cc1baa33516c092ecb1f8ff2c644bfa7dae8895ea0f7c68af77f6edfe1f32c1fbac2c38c8fd0063adbe2657c4c5a35c4c745cf0e5955f1a8
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/half/half-0.2.2.3.ebuild b/dev-haskell/half/half-0.3-r1.ebuild
index a3d59f34d96c..dc4816532737 100644
--- a/dev-haskell/half/half-0.2.2.3.ebuild
+++ b/dev-haskell/half/half-0.3-r1.ebuild
@@ -1,11 +1,11 @@
-# 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.6.9999
+# ebuild generated by hackport 0.6.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Half-precision floating-point"
@@ -21,4 +21,6 @@ RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/quickcheck-2.9
+			>=dev-haskell/hspec-2.4 )
 "
diff --git a/dev-haskell/half/metadata.xml b/dev-haskell/half/metadata.xml
index d645c4d28e7b..b7878815d80d 100644
--- a/dev-haskell/half/metadata.xml
+++ b/dev-haskell/half/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">ekmett/half</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hamlet/Manifest b/dev-haskell/hamlet/Manifest
index 6aaa356feb2b..18c020e6cc39 100644
--- a/dev-haskell/hamlet/Manifest
+++ b/dev-haskell/hamlet/Manifest
@@ -1,3 +1,3 @@
 DIST hamlet-1.2.0.tar.gz 1636 BLAKE2B 21b9b161238d715f5ec2c4e97ba05b87c73276f5acfea11c2bf04eb64c4bf24902def08be45ee4199e7489798e2d6df87aebf934c9a771f070078272d99a9cff SHA512 8bc20f0ddc64b6943f0e85cd7f6babf5bbd6121bf50d420824320241b6ea270876fb58e39e3275d8476b959a815e6a6fee711e3376c18e88f25cccfeb059f99a
-EBUILD hamlet-1.2.0.ebuild 604 BLAKE2B 9b965223a855ab67f481221099b3a93aad8e508b557c41896dba778ff734542303451a865dee2b2484713e5e4d7b25c36df5756307e5345252eedc1a4f8dd6ce SHA512 8b9658d523d61c2e81a49ee6da1624af92dfd167ff387800c551614243cd9765242853ce34f291052e6f6dcbce764d2ec74be7adb747b8f54a268e323a943cc1
-MISC metadata.xml 1210 BLAKE2B 8e5382425f1a7c674db2655ae33d8f9ca24708ff869da8da4371bae3bb4095934dc3796405fd5168e199f2cd9e910ac60a64cb003004ea7a549fc260f290256c SHA512 60ad8abe20655a18d186db1f14b9e0e105f23e2aad34a1d6978a1b2b3e2c95ac223d428f098ecc8000dea04fca19998da59f0254238807ccdee79c987e034fa6
+EBUILD hamlet-1.2.0.ebuild 627 BLAKE2B fa6806a80c4c59c1d6527b2291e2337198f74970730ada6519dab5acf5c31657220f3ef8deadf7f27e1e5c1233b3a41bf9573c39e1c8e5c02561521c4b839730 SHA512 2f35ef081334b3a87617366e351102b26be5b1f5987f55bc345daff095d7a541cadda703854a8014bf91dda93d80dc69a8534bfd815baaf2c9a4cd1a4bcff7ff
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/hamlet/hamlet-1.2.0.ebuild b/dev-haskell/hamlet/hamlet-1.2.0.ebuild
index e2ddb4d988ea..3fa8422e6489 100644
--- a/dev-haskell/hamlet/hamlet-1.2.0.ebuild
+++ b/dev-haskell/hamlet/hamlet-1.2.0.ebuild
@@ -1,11 +1,11 @@
-# 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.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="lib profile"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Haml-like template files that are compile-time checked (deprecated)"
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/hamlet/metadata.xml b/dev-haskell/hamlet/metadata.xml
index c842c33be2f7..b7878815d80d 100644
--- a/dev-haskell/hamlet/metadata.xml
+++ b/dev-haskell/hamlet/metadata.xml
@@ -5,21 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Hamlet gives you a type-safe tool for generating HTML code. It works via Quasi-Quoting, and generating extremely efficient output code. The syntax is white-space sensitive, and it helps you avoid cross-site scripting issues and 404 errors. Please see the documentation at &lt;http://docs.yesodweb.com/book/hamlet/&gt; for more details.
-		
-		Here is a quick overview of hamlet html. Due to haddock escaping issues, we can't properly show variable insertion, but we are still going to show some conditionals. Please see &lt;http://www.yesodweb.com/book/templates&gt; for a thorough description
-		
-		&gt; !!!
-		&gt; &lt;html&gt;
-		&gt;     &lt;head&gt;
-		&gt;         &lt;title&gt;Hamlet Demo
-		&gt;     &lt;body&gt;
-		&gt;         &lt;h1&gt;Information on John Doe
-		&gt;         &lt;h2&gt;
-		&gt;             $if isMarried person
-		&gt;                 Married
-		&gt;             $else
-		&gt;                 Not married
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/haskeline/Manifest b/dev-haskell/haskeline/Manifest
index eeda0bfe9a6c..f78dd182109a 100644
--- a/dev-haskell/haskeline/Manifest
+++ b/dev-haskell/haskeline/Manifest
@@ -1,11 +1,3 @@
-DIST haskeline-0.7.1.2.tar.gz 68251 BLAKE2B 0e28ee337d1d7979d7ae81cf73d9b2d7e566039974420a7706a871b83b21164bef1909507dd301b3bb4c22675513ebffc36e5b68c134f5669af6acdeedc40ffd SHA512 11d3ee9507d10d14ad05a45eb269a70a661e755502c7a39c5516508e66bda7c0d56c0d91db3e6ea665ee532001bef246be14a95c12eb257724616753e2b93f6c
-DIST haskeline-0.7.1.3.tar.gz 68291 BLAKE2B f1e645d7cd4886cd1d7b9cd42ec64b27dceaa8d3f3d569555d3cafe792effc34550a320fe221f3278e33abe390908149990299e041e9480682aca6d649f6b102 SHA512 eed183edd1af5b9d77c61278c40f07599900793e47858771810b48cbd178c34a06264910dd5484f76e5a03e53551e1035e1d291d8e3577ec6f4f5a9ba8d61d5d
-DIST haskeline-0.7.2.1.tar.gz 68409 BLAKE2B e966c75e476e5167fc3b59c4c92d00af135b96f52790ce4641771fcc5d5f25e8c21abb64088da183559e4fec60a985def5d3c90e3f34b292d3d690f2b81c3aa9 SHA512 a2f790b9bb27cc8681567c3c0c3476231976d08a0e2d1e9fb69301f55511edd0221034ae8af27ec4c9db4b15f2d72b8b716d013518d0b8d15d98e859dbf0321b
-DIST haskeline-0.7.2.3.tar.gz 68332 BLAKE2B da80d367102c61775956c5c07906ef4848df60ec1af00a2a0f0199ba06219515f57681a0f158ff7a4c2a478f5af40716a6f240f16a49249249e78cf2a6892a41 SHA512 94e24ef66c7a782057c3495eba74b7ae3c703bff47b2598c840e1372b2b19a09fb97c5075660074ef6bccde9a6c35e234df06fda5de103e2fe5b4fdf7df069b8
 DIST haskeline-0.7.5.0.tar.gz 66156 BLAKE2B b8b2e589681255572393f07d3794647d657d4992979dcf1c6a3eb073dc3b5cfc6ad182b7cb2a7b9ee5b54da797b6a79d710974f2a46068fdea411fa4fdd5086c SHA512 624b102fe2446f347fb8b0f1027dcfcffc47c7ccceb900357aa3d17a1303b25480189c25dbb548d2dd303fe7577e54eacdd232c2dba143e6c8ac4d7e5fcf0b27
-EBUILD haskeline-0.7.1.2.ebuild 1108 BLAKE2B 989987b28db2348d424382a59dd51a740b235a139a39b8e8934e3ee0e8549ee20dc41b1ba3f0c6ad8a6b71ffeca006c2bcced73004a965cd14269324f948c67b SHA512 a5ec70af79137e074a2e500e9122985e26fa9b99982e6e31e21fb86ff88398bf6e6b72fa68a8231630e7961c9db1d44c6eb269e24cd68d66f7b7e1b7af4cd46c
-EBUILD haskeline-0.7.1.3.ebuild 1074 BLAKE2B d05a9130c9ff43bfafc6566268aa9c6af7f2b01567e022cd5446c97b3861fdec9d7428628cd7c06612dbd08de4486ba244d6a1fe07d07e6be363f06f1bd08ba7 SHA512 7e4d2e02043355b046e6ad23cb069abf37cfbe688f23b49c53c6ecc104db2cb7654b99f7c88dc48fe4113503e7726663edbdd604218cc224d5ea4d68ce74985b
-EBUILD haskeline-0.7.2.1.ebuild 1215 BLAKE2B ef9e147644f2af5fe7903ddaaed736332c70449032005f7159f3d98079e7a28143231eb40cfe8d2227de5eb40484c118c155fbec7cda8dbc4d9a7e31b8ef2536 SHA512 5ba484ea495eab9ed4c617c8540529ca4c6c366317e2cb8cafd6b9a4e2699ac4196b97f3914bb08203eb81d71e01df0d5ebdf8eb28066dc2ff8317e48628c554
-EBUILD haskeline-0.7.2.3.ebuild 1276 BLAKE2B 52f1fa001db855db6c006c4ff76e2429df6b4afc77048dda50ca14880e6ce3d4112b5c7fd137b34fabb8677f5a95c432cdc6a880427efd10e3208e5a75b97ff7 SHA512 6c67a61f386366dabb389a6d10c33229732f351fe202f1a01d673ea0e105e41312af13b74129633627124f26e9a77c821417bea8186ef6e882a0378dd5e7e098
 EBUILD haskeline-0.7.5.0.ebuild 1023 BLAKE2B c96cf5336f95e68466c744ddd7d40b7b5db60b84d77fc88149e0c6e85f27b4d88c46417da8299c24c54a1e6a1f7e954c5517aaa1c4f6284914b5fe41494f97d6 SHA512 1b30ce1e6aa13af6913ce09c00f44b8666aa095c1791a3e96e4538377647a175677034482426cb452e38d0edcaaac5480c3f50499591914b50aa8f6d0f04ce38
-MISC metadata.xml 946 BLAKE2B 160e58571e6f868f90e507b4309ea26c352515a4ca67071a8fe130af4d1f2807aa5b123f7f1f0dc2dae4a1a5a3d3ceedce3ab63e65f9da711b522d079e64fded SHA512 dfecbff217817c7e7588112e7fcc36f95c8520423d7b023f979c1316bd314efc62e2d7cff8aa7ca9716bf19ad98d205529ef11b56c4557e2a40624a1c0656e18
+MISC metadata.xml 759 BLAKE2B 9b5adebf002ce3c46477b073dfb0859a2635156a0b0344c6da5748e3126494682814d4712b8d5e47aaacbdabf7ecb2b9304a25d1f20bfc9485ecde6a28648900 SHA512 f652a2195ed544745a5df8f92361cfc2646a1478ac546fd16885231e9e359717f6af463562c057294f26b865769774ca5a2606327a12e84d47caa66082489f27
diff --git a/dev-haskell/haskeline/haskeline-0.7.1.2.ebuild b/dev-haskell/haskeline/haskeline-0.7.1.2.ebuild
deleted file mode 100644
index b1bfe1dd82bb..000000000000
--- a/dev-haskell/haskeline/haskeline-0.7.1.2.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.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A command-line interface for user input, written in Haskell"
-HOMEPAGE="http://trac.haskell.org/haskeline"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE="legacy-encoding libiconv +terminfo"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	legacy-encoding? ( >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] )
-	terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.8.4"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag legacy-encoding legacy-encoding) \
-		$(cabal_flag libiconv libiconv) \
-		$(cabal_flag terminfo terminfo)
-}
diff --git a/dev-haskell/haskeline/haskeline-0.7.1.3.ebuild b/dev-haskell/haskeline/haskeline-0.7.1.3.ebuild
deleted file mode 100644
index fe54e4f18e23..000000000000
--- a/dev-haskell/haskeline/haskeline-0.7.1.3.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
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A command-line interface for user input, written in Haskell"
-HOMEPAGE="http://trac.haskell.org/haskeline"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE="legacy-encoding libiconv +terminfo"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	legacy-encoding? ( >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] )
-	terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag legacy-encoding legacy-encoding) \
-		$(cabal_flag libiconv libiconv) \
-		$(cabal_flag terminfo terminfo)
-}
diff --git a/dev-haskell/haskeline/haskeline-0.7.2.1.ebuild b/dev-haskell/haskeline/haskeline-0.7.2.1.ebuild
deleted file mode 100644
index 140aee2c50f8..000000000000
--- a/dev-haskell/haskeline/haskeline-0.7.2.1.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.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A command-line interface for user input, written in Haskell"
-HOMEPAGE="http://trac.haskell.org/haskeline"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE="legacy-encoding libiconv +terminfo"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	legacy-encoding? ( >=dev-haskell/utf8-string-0.3.6:=[profile?] )
-	terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.10.1 PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1 PM:7.10.3_rc1 PM:7.10.3"
-
-src_prepare() {
-	cabal_chdeps \
-		'utf8-string==0.3.* && >=0.3.6' 'utf8-string >=0.3.6'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag legacy-encoding legacy-encoding) \
-		$(cabal_flag libiconv libiconv) \
-		$(cabal_flag terminfo terminfo)
-}
diff --git a/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild b/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild
deleted file mode 100644
index 1685b35f7801..000000000000
--- a/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild
+++ /dev/null
@@ -1,44 +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.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A command-line interface for user input, written in Haskell"
-HOMEPAGE="https://github.com/judah/haskeline"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.0.1
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="legacy-encoding libiconv +terminfo"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	legacy-encoding? ( >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] )
-	terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.0.1_rc4 PM:8.0.1 PM:8.0.2_rc1 PM:9999"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory>=1.1 && < 1.3' 'directory>=1.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag legacy-encoding legacy-encoding) \
-		$(cabal_flag libiconv libiconv) \
-		$(cabal_flag terminfo terminfo)
-}
diff --git a/dev-haskell/haskeline/metadata.xml b/dev-haskell/haskeline/metadata.xml
index f7c660f2d70e..3cb2b1d1146f 100644
--- a/dev-haskell/haskeline/metadata.xml
+++ b/dev-haskell/haskeline/metadata.xml
@@ -15,8 +15,6 @@
 	</longdescription>
 	<use>
 		<flag name="terminfo">Use the terminfo package for POSIX consoles.</flag>
-		<flag name="libiconv">Explicitly link against the libiconv library.</flag>
-		<flag name="legacy-encoding">Use legacy iconv encoding for POSIX. This is only intended for testing.</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">judah/haskeline</remote-id>
diff --git a/dev-haskell/haskell-platform/Manifest b/dev-haskell/haskell-platform/Manifest
index 077cb1820296..d5b61f94bf56 100644
--- a/dev-haskell/haskell-platform/Manifest
+++ b/dev-haskell/haskell-platform/Manifest
@@ -1,2 +1,2 @@
-EBUILD haskell-platform-2014.2.0.0-r1.ebuild 2129 BLAKE2B 95da2299609e5b6e9bec0e9637b532215228367985ab8c7454b878bb28fe9c12af8d8233ec087c26bc956e00fee5e998eef4f0976d4b5392f49d63348ed29951 SHA512 0ed6c2b466803acfe7313f5fd6931ac47f8752907ac999fe66e6400fa95524e362cd25ee786aa115f6a571997ad60c9c9317822b9bd6c3111000b04dcdd10731
+EBUILD haskell-platform-2014.2.0.0-r1.ebuild 2120 BLAKE2B 91ba63b2313b9b27a63590b77758e2c228dbe888ae1da20046d7ff9196bc1bfa1a2761eb494d5ce0fbc159067983c0f8315d2abb8bb1b37f9c67c5380d4840af SHA512 22a7fb1fddd981246d17431556d152590c45c3b3637f0fbc95a52d3d83a0391cb97f874e2e207efe8f2b2d3091280dba2db1a642e63a9464ac6239956b6b2b43
 MISC metadata.xml 712 BLAKE2B ce35d5fa9cc59091ade2ae273780e09c16b1a7aed39ea8eba01e7164e0776903635cef566fa5801d826e14c11169229d23dc25c3afd8b19fb46c0289b61e79e5 SHA512 44c4ad8c6ffde41e1c52dd9b477ae002579b5fd2878a68a23826ff56aa856d8e0f5b5d7571de69dd6a5bbb530b59d84237313e575d853b6b054fbb2690d6e227
diff --git a/dev-haskell/haskell-platform/haskell-platform-2014.2.0.0-r1.ebuild b/dev-haskell/haskell-platform/haskell-platform-2014.2.0.0-r1.ebuild
index 6f3f9525efa2..682281b41f5d 100644
--- a/dev-haskell/haskell-platform/haskell-platform-2014.2.0.0-r1.ebuild
+++ b/dev-haskell/haskell-platform/haskell-platform-2014.2.0.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="The Haskell Platform"
-HOMEPAGE="https://www.haskell.org/platform/"
+HOMEPAGE="http://haskell.org/platform"
 SRC_URI=""
 
 LICENSE="BSD"
diff --git a/dev-haskell/haskell-src-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest
index 1b20690de57f..caf05b3121c7 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -1,5 +1,5 @@
 DIST haskell-src-exts-1.17.1.tar.gz 2489624 BLAKE2B d98a54e9788fbc613d5843fb3886bdd44b20843978a71cdff5460390bc090504ce72191884f49ef35266c5167913ef1dbf53a19a25d235d12192dea1f3b01203 SHA512 e08bc31720640e595803ff33d454b717cd015cf8b70f0196f387e7ebaca4b3551aa41ce6c900370496a68e48e1a9c078235674f7050f6de42ffdfc9fce6544e2
 DIST haskell-src-exts-1.21.1.tar.gz 1248986 BLAKE2B f76d5e5ca978aec46a0f2e5f2442cb3960ffb3008ad11955e5f04cfce38613b6073af59b6e8eb32975664d3f22ee31334166daafc5d935f18e7a008b3d28332b SHA512 1349d419a13343fdf5579bf1f4027a3906de67ac257d0663fb6d10cf96e8312e08beec81d91044421f1202675a8c9381d280104d95c1ffea2e746f378d683e61
-EBUILD haskell-src-exts-1.17.1.ebuild 1067 BLAKE2B 8555b0beee98fde23fe1ec5001ebbdac97849803ca5a7f76fd6b1b910734cf4737f8fc4c357321249f4ef6a24dc15e71c7d7e43417d459e343b23e0a8a170293 SHA512 164376ef3de9e37a0c7a68e50b134ed9ac0cc0b4d288adecb8895c1f92fad8296cf8732f08e0eabf396f4d3ed10ad1563d3911f29b3bfc42db4b3013dc6a3080
+EBUILD haskell-src-exts-1.17.1.ebuild 1067 BLAKE2B 3efffa321c1e5092987a68b4a5d8e0d1f7432255fa8ae80233e1a60892fa4fef582dcf506d4d4dad52475879e8c22480bc081b7bc9ffdc7d71c88c11f45c7293 SHA512 82026a4cf81f0925167ce9ac2802a8e0d5c65d048f0e21518a3b47d9eaf7da57c5c67ccca51b07c4dd3efdbb5c07fcffb1d88b60336b7435bdd29701ab4950fd
 EBUILD haskell-src-exts-1.21.1.ebuild 1014 BLAKE2B 986d5d068def2da1997b61323a77f6c03d3020dd3eae0469216e76464b3f0b5357f6f6d32987a7d8a63045c765a70c95f4eb20d991b062d28886f5e5a350ae4c SHA512 5ce4a51e6b06879985310982edbb9699c3d54351d208a58385a8688d508eae872879a5da25630c23d8f016a5dd9d3f657063371a4a69d33cab0d8cc22b222287
 MISC metadata.xml 778 BLAKE2B 88754b796b4201cb9fd07d237a7c750dfa5f2a306e152bc8e0dedcf410bbbf0836d954e4522dc39790e18f83858844380d96f25be34f3133a042a234d6d50467 SHA512 ac9bfe683996bf5860b908657539f7cb79fcfb300cb6e852e18d1400fbca52e4d7320c525b15cd9a7924bb5be682d75bb5a5f4435012e49eaa66e1076fe73289
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
index 021fe155b954..6eec8f814206 100644
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
@@ -1,7 +1,7 @@
-# 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.6.9999
 #hackport: flags: +base4
diff --git a/dev-haskell/hgettext/Manifest b/dev-haskell/hgettext/Manifest
index fc9836870a42..e1d32f1f473f 100644
--- a/dev-haskell/hgettext/Manifest
+++ b/dev-haskell/hgettext/Manifest
@@ -1,3 +1,3 @@
 DIST hgettext-0.1.30.tar.gz 6289 BLAKE2B 1da585c19bdf8882249b22cbf9d65056b6b5856d4207578f48aeabbebb9ef68fdfff2cc29d275c74b42a0e1e54edbc4652a7cbaba1bcf59a2c6e52502636440c SHA512 f37c580e4e0e60691b86a6fa392e2809ef132d394507879adec2bd498bf0f678217d88475f261a1d359d36ffbd08e6177194a65872854d14f8f9d071f2f91af9
-EBUILD hgettext-0.1.30.ebuild 703 BLAKE2B 42c25ff4ac0a3c5ff6ab511bd61660c92cb1f7997ffa16b629b33ad4ec8f8794e763cd91de9dc55e47df37e5596145b153eef2a60ad083391ca553d4566b7e3d SHA512 5a54e9ba5c5767c7b9e24e64a74884d3f444cd99699c018226622bbb07395b87be5164d7aad3f4c8ba73e5ac8bc1d3f1ed30029974a78e58e355d5de44197b64
+EBUILD hgettext-0.1.30.ebuild 703 BLAKE2B d216dab0f3fccbf1e89a1a2c4d44c1b4f3050ec29029f7b96abebcac23689017efdfe068430d27fa0997273018c76aa9187680b950aec35375cf5c660e08d7c2 SHA512 c1a8978dcc7c6636a28af106f12d0496c7fed6763645838ee214ca5e6a75f408fee2d43a8c29003052bbf878b44ef888670b6143c220fef522e677e23b8be869
 MISC metadata.xml 329 BLAKE2B bcff0c1997ac323a93759b785cb3c6e1842a6cd30098e3502886c285093f093c0f4da97a1488805edfda4645b0b128717c45e6d7f74e28aeeab8681da9c61033 SHA512 f5355f81daadfb078e8a7954778b290f0d933ee6c22f5b21531292d5da494fdeec3b8c091b1707e3cd9d762a32ae81b1eccd2ab07c12da4a7dcd0e58b82b540b
diff --git a/dev-haskell/hgettext/hgettext-0.1.30.ebuild b/dev-haskell/hgettext/hgettext-0.1.30.ebuild
index 0f991459b2f5..ec8b6bf57627 100644
--- a/dev-haskell/hgettext/hgettext-0.1.30.ebuild
+++ b/dev-haskell/hgettext/hgettext-0.1.30.ebuild
@@ -1,7 +1,7 @@
-# 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.3.6.9999
 
diff --git a/dev-haskell/hs3/Manifest b/dev-haskell/hs3/Manifest
index ce88c08ddb7e..57fa6874cd49 100644
--- a/dev-haskell/hs3/Manifest
+++ b/dev-haskell/hs3/Manifest
@@ -1,3 +1,3 @@
 DIST hS3-0.5.9.tar.gz 19981 BLAKE2B 085c09739c666b658f0fcf2e82cd7bd7c1fd033d29490a7a6754c43ecaaf495ce914a2c987d2fd852b95b2714cabbf9d6106cd9a3b9c92daceb9b70f46832191 SHA512 30a3393f28a6ddd930cda1b866527ead9be59d376c2a6c3123eab3278a996602307612f3eaf126b36ef4a09c65784b842442ff09caafbf605474b42b6582c79d
-EBUILD hs3-0.5.9.ebuild 1252 BLAKE2B ee57572b944adf4ba93ef34de6d7be84b31c52485a414da44207f480bfc7946cb884db83d8ee10eab43abc88cf961b092ee4dae512160afd987521ca931c201e SHA512 395bead50bbd26cbcc64f0867a155ba4fa753daeba67bd709202e01dfb5ad5a43d895363c3ae2d0f12aecdf89761ce946a55c3978985e46739a5074fad7cf76a
-MISC metadata.xml 606 BLAKE2B 2f04cc657650a93cf3366b1932824e4694f473c25bdbb5bd636b1b15a8fa7f4ca11590b3ba0b9b6b8ee028d6e7739893c52126d0b13a4429a3653654cf2d1eb5 SHA512 c8e235ef80c751d633fb7c8c79846d47c79d6d87c418dd4f3a61261b5a0e9d66ae1a76310a9c31284e49e775373e6c1950e24d49d9c28250a5913e1d36bdfa84
+EBUILD hs3-0.5.9.ebuild 1317 BLAKE2B 46f4bbbbe3f661b160bdc1d8b96230dc46040c6931af9f25fbf0f8f016a834101b060c1b54736e9b421d36498d73adb2644f041254cb360ee8bc474643f95566 SHA512 86e3cd519d043ef74512d069b6e2947d849e25c684d0623d94131b8b4eb80563bbe1ab4fd01a9639d2e938a4bd27ab696506c5e83a4855ff5f214ae45f2c251e
+MISC metadata.xml 609 BLAKE2B 94244e2bc67520b810b576db4df8e83af37da37ce0e4bb98828159e620382b448514b0cb4290b41ecb18434a630a5cf9ac39f540bfedb05331adb2289df89dd7 SHA512 9184647c1e928c007c016712f41b990ac88023d6898405a30b51c79710bdc0e8bf0c781336462eca2c69e52ae5e123325b1abcbaa086ea3fc0acabb9138fa1da
diff --git a/dev-haskell/hs3/hs3-0.5.9.ebuild b/dev-haskell/hs3/hs3-0.5.9.ebuild
index 28e59fc71f17..c1f77d69f0bf 100644
--- a/dev-haskell/hs3/hs3-0.5.9.ebuild
+++ b/dev-haskell/hs3/hs3-0.5.9.ebuild
@@ -1,18 +1,18 @@
-# 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.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 MY_PN="hS3"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Interface to Amazon's Simple Storage Service (S3)"
-HOMEPAGE="https://gregheartsfield.com/hS3/"
+HOMEPAGE="http://gregheartsfield.com/hS3/"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
@@ -25,6 +25,8 @@ RDEPEND=">=dev-haskell/crypto-4.1.0:=[profile?]
 	>=dev-haskell/http-4000.0.0:=[profile?]
 	>=dev-haskell/hxt-9.0.0:=[profile?] <dev-haskell/hxt-10:=[profile?]
 	>=dev-haskell/missingh-0.18.6:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	dev-haskell/old-time:=[profile?]
 	dev-haskell/random:=[profile?]
 	dev-haskell/regex-compat:=[profile?]
 	dev-haskell/utf8-string:=[profile?]
diff --git a/dev-haskell/hs3/metadata.xml b/dev-haskell/hs3/metadata.xml
index f5992552813d..397148db120a 100644
--- a/dev-haskell/hs3/metadata.xml
+++ b/dev-haskell/hs3/metadata.xml
@@ -5,13 +5,13 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<use>
+		<flag name="network-uri">Get Network.URI from the network-uri package</flag>
+	</use>
 	<longdescription>
 		This is the Haskell S3 library.  It provides an
-		interface to Amazon's Simple Storage Service (S3), allowing Haskell
+		interface to Amazon&#39;s Simple Storage Service (S3), allowing Haskell
 		developers to reliably store and retrieve arbitrary amounts of
 		data from anywhere on the Internet.
 	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-haskell/hsb2hs/Manifest b/dev-haskell/hsb2hs/Manifest
index a463aec7d2d6..8690847f1efd 100644
--- a/dev-haskell/hsb2hs/Manifest
+++ b/dev-haskell/hsb2hs/Manifest
@@ -1,3 +1,3 @@
 DIST hsb2hs-0.3.1.tar.gz 2387 BLAKE2B 747ad23761939c543d067a031869528b55149bc7c01bb417d107d4be2c61726d286798b174805469f176dfd74c003534feec92ee0aba27aee9ce4e5a9bf55900 SHA512 3be89ccfee5b10e604434943ba22476c4cba2e9f4c57e169fd3674d4a46250c8d4c35edcb46ff5509ccfca80ec7d45a594008791970d15256864abfdf29381e1
-EBUILD hsb2hs-0.3.1.ebuild 570 BLAKE2B 8f392526a954960f82bc1536f867ee93239daa4c6d4aa5f26f750e6d29907b89bec268c3a61d0e493a26cec15e9f3331ad9a84561eead38f2c3bef5a3a762e7b SHA512 fd69ed8902c5603bb321b3f52814d3b973c1b5acf95fb5d3caa8617332427ea8e85fe41c12f39d158c0baaada8c31b7db698d9ff8545c479ffa7e6161438c664
-MISC metadata.xml 560 BLAKE2B 41868a670fbba28b8c473817e2db85bcf05a48b540bdb90c117b71023fd123a0dfd291a529860b09d65995b147dbcfd6721c3cdebfbac55f4c02915c556a452d SHA512 b048484522a8117cdd729b682c9ea9023ea4a5820903822ac732d54972ea518fdbf928e6d22a5c9eee10e92cbcfb4095978d66cd2543935cb70c2dc2e066f9e9
+EBUILD hsb2hs-0.3.1.ebuild 567 BLAKE2B d7bc1397835e0a8099ada431a7d2b18dda9a96be61f61d46b89d2688dfb8f5e8bcad14af252149693a5cb7d96eb85d333d4bd4dc397aa0787d15d97c39fd0bca SHA512 f0cb33b7b70cd59762cfa1eb5e8308f30a0d50adaa1baa26c0c1694dffa42dfe35b6be30f82a6536b6fe7c543ae59b5ae1da005f51b50ce4d97b62d8d0c7a77e
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild b/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild
index b8bc788b616c..c0b8224ccab6 100644
--- a/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild
+++ b/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild
@@ -1,11 +1,11 @@
 # 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.6.9999
 
-CABAL_FEATURES="bin"
+CABAL_FEATURES=""
 inherit haskell-cabal
 
 DESCRIPTION="Preprocesses a file, adding blobs from files as string literals"
diff --git a/dev-haskell/hsb2hs/metadata.xml b/dev-haskell/hsb2hs/metadata.xml
index ffccae0e3680..b7878815d80d 100644
--- a/dev-haskell/hsb2hs/metadata.xml
+++ b/dev-haskell/hsb2hs/metadata.xml
@@ -5,10 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		hsb2hs is a preprocessor that allows you to include the contents of
-		files as string literals in your Haskell programs and libraries.
-		It is an alternative to file-embed for those who do not want to rely
-		on Template Haskell.  See @README.markdown@ for instructions.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/hslogger/Manifest b/dev-haskell/hslogger/Manifest
index 470bfff4a24c..2b882f795a30 100644
--- a/dev-haskell/hslogger/Manifest
+++ b/dev-haskell/hslogger/Manifest
@@ -1,7 +1,3 @@
-DIST hslogger-1.2.10.tar.gz 35889 BLAKE2B 68f18236cfe19ad1f5b6fd8b9fc32dc571fe7aca730c5210863aedc88e32b1094e939c8825730fbf901fc1993c595ed0711f3d2efb041c789d674e4dcdb93723 SHA512 c2e3c6e7c8598aca2a18e507defa7536db7fdf15265b900401f8558b3259cd770531a3a302d6eb9ecca63a9629f0d5796e1ec94d8f21ecf153a1fc49f889183a
-DIST hslogger-1.2.9.tar.gz 35576 BLAKE2B 56c3a917d2db7207d29c304b00a237b7d62a4f8f07d72f7b1ce834d3e60bb55f825173cd8894d2063973df4095ef3409a2c1aabb99d89257a5d8562d58add76b SHA512 6315dd7e6d6769a6a8fb8576b54875fbe79860d1e3158ddbca7f15b286f13b59cf7e817ac5325f31ae82e8f5328d32f22ee6aa37f5ae11e9070f209454ec801c
 DIST hslogger-1.3.1.0.tar.gz 37468 BLAKE2B 24bb750c356f071ee35cc84e01b2483f612b6e7403fe8fe60b8af148dba43107660a36a0e30305666fb76af1939ff00f6817dff98720ab7eef321192e6e87976 SHA512 a08e7c85efe2b3f97e87b54db993f78ac31380f9b6f8d926517854771f482b2c64c358ddd12a449a413e5af0f374c034161b6f772148835b50551dc2cdbfa15a
-EBUILD hslogger-1.2.10.ebuild 763 BLAKE2B 2fdeab40b20557030a020f43ed742afb933375e0f53cc158744e7ddfbcd1d49c69b156087ae7d7d00c7a808a22c98188d600a66e4096fd363f668e08aeed62e3 SHA512 00d196edab14825026ea55e58082885f511f8081731fa9391823372e8a2d47587128fcd17bde194fa161202a1aac515bc639a099f4287302fcaaf9f0143c1827
-EBUILD hslogger-1.2.9.ebuild 743 BLAKE2B 95ff7e4f4df6dbcc08d603e47b977afd224095eab14f76eda260b7f2039ceb045e350a15369ae6fed0ed51d4f29860cbc61cbfc1d41f359780505bfb03d49086 SHA512 844b7f539220fdb75cc617311f3da2904eb1b3a799ec54ce65b4c26ea595a644c4fc4d260da0d381358381144ee71a9900eed7019e075a86f1176e955bbc511d
 EBUILD hslogger-1.3.1.0-r1.ebuild 1308 BLAKE2B 73891c296306463996fbaf192a9aefa8e0b2e49a170159bd4d6347ce87d07fb6787ef8d1f6b1ae0889257705759efe855f1520466f817f7212d65daf5e02c442 SHA512 87fb214c0a79eb0280fb6a1db873fd3d66f50645643f0bfb591cbc455eafa75585dbbf0a9f0864c5707f4b35df3fefd1b0146e8169901c65d433c86b595cdd47
-MISC metadata.xml 847 BLAKE2B de3b709091b3b13f55a7ee468eae7f7c9f24d7daee5f1fb47608cb388d1e4d1bc0ca9d5782bda926f7358a150ba73992932dea824d7e18414b6361a08f979483 SHA512 786700f6779652375db0a2064339aac864d1166e06fe7fcd5f4547eede32a9993c5fcb6bde44487e02fc444be2d17a1044ab9d1457716da85daa7516e9a9dea0
+MISC metadata.xml 774 BLAKE2B 89ac7363bebfd97f28900463c0d986d56db3a46e8a9d67b8bdcab63909557e7f71a4f2cf789bf01c38dacbd34a594c43f463c2df33419c401d2f12386d9674bb SHA512 519ec4dd47fadc3a53d60620e494a3ce97dc13b87978510e08eac4bfb8d9bd83829f600d5eb4a0497878aab9ea9341239792152dc26c3f40a5cf7b2bf3ded9d2
diff --git a/dev-haskell/hslogger/hslogger-1.2.10.ebuild b/dev-haskell/hslogger/hslogger-1.2.10.ebuild
deleted file mode 100644
index 4e91774a751a..000000000000
--- a/dev-haskell/hslogger/hslogger-1.2.10.ebuild
+++ /dev/null
@@ -1,34 +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: -test,-buildtests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Versatile logging framework"
-HOMEPAGE="http://software.complete.org/hslogger"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-buildtests \
-		--flag=-test
-}
diff --git a/dev-haskell/hslogger/hslogger-1.2.9.ebuild b/dev-haskell/hslogger/hslogger-1.2.9.ebuild
deleted file mode 100644
index e9023bbe4ec8..000000000000
--- a/dev-haskell/hslogger/hslogger-1.2.9.ebuild
+++ /dev/null
@@ -1,32 +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="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Versatile logging framework"
-HOMEPAGE="http://software.complete.org/hslogger"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="buildtests"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag buildtests buildtests)
-}
diff --git a/dev-haskell/hslogger/metadata.xml b/dev-haskell/hslogger/metadata.xml
index 08447e480706..377e9a7c8d64 100644
--- a/dev-haskell/hslogger/metadata.xml
+++ b/dev-haskell/hslogger/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="buildtests">Build the executable to run unit tests.</flag>
 		<flag name="network-3">Use network-3</flag>
 	</use>
 	<longdescription>
diff --git a/dev-haskell/html/Manifest b/dev-haskell/html/Manifest
index 81cc07071f06..17011c4dea4b 100644
--- a/dev-haskell/html/Manifest
+++ b/dev-haskell/html/Manifest
@@ -1,3 +1,3 @@
 DIST html-1.0.1.2.tar.gz 11021 BLAKE2B 95ce5a7cfe1a9342d490c46255c5c1a5885a428a60941cead82f353420f60401f10ead1aeb1dc317251bee2553ae89f5de288e8e1946269e5f08630130163717 SHA512 e7ce2be53ce4c7898aa8772c34d1469a90fcb5258ffec0cb1da544f334b6f13ecb73060dfec2284622be1156a2adbadec8b9cac5088c1ca9d84edfb50719b9e0
-EBUILD html-1.0.1.2-r1.ebuild 584 BLAKE2B dc0a8531cc7290dc6d11e70b235307531330843eaa8bcd1ee4bb6bb11e5b0bb31d99c582dee27176ee4d1333f9f0b17d681e70e094ce5b7a273a0274d7577d4e SHA512 6c95c74b5b2d16565d38937c5deeabff936753bc29b253d8bb2ca25af7788b055d51a78f311cee93cccaba16141092e5013c37d4b25f30df71c363fa249b98f8
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
+EBUILD html-1.0.1.2-r1.ebuild 586 BLAKE2B f9b4d1d641d2b595b0f7666d0a7e50d5280b23448b04eef6972be222a87ee2d03a4f2626754b9934b8596f3945b7d70ea8a7dd7981b43e556cbb09ca699a4210 SHA512 46cb18730ddf641b4e914df86faefb294e8be5ec3154208ec82d4a0e559553229d24878cd177c26fe52af6dd3892584f2f6b4ad8624ba01b7dd8f05480ed41bd
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/html/html-1.0.1.2-r1.ebuild b/dev-haskell/html/html-1.0.1.2-r1.ebuild
index c1bad49b169a..aeb69575b4aa 100644
--- a/dev-haskell/html/html-1.0.1.2-r1.ebuild
+++ b/dev-haskell/html/html-1.0.1.2-r1.ebuild
@@ -1,9 +1,9 @@
 # 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.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,6 +17,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
+	>=dev-haskell/cabal-1.0
+"
diff --git a/dev-haskell/html/metadata.xml b/dev-haskell/html/metadata.xml
index 522384de8446..b7878815d80d 100644
--- a/dev-haskell/html/metadata.xml
+++ b/dev-haskell/html/metadata.xml
@@ -1,7 +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>
-</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/http-attoparsec/Manifest b/dev-haskell/http-attoparsec/Manifest
index c157f30f1ed4..8a580c5f84a4 100644
--- a/dev-haskell/http-attoparsec/Manifest
+++ b/dev-haskell/http-attoparsec/Manifest
@@ -1,4 +1,4 @@
 AUX http-attoparsec-0.1.1-http.patch 314 BLAKE2B 3af42442fa504726c5eacaf7686448611c22ef4ea6e8908f06e54a5bedd8969bf0d69598865d758027116d034ee9012d78baf331c3c51a728f337e780ea8bf2f SHA512 bb52b574df35cf76b0269a216d8d11cb04dafeba88a7f0d0581a0296e49d8eb125038a431174618964d3afa76c50b9eb5315101648ce8a2564e4ea685445620c
 DIST http-attoparsec-0.1.1.tar.gz 2501 BLAKE2B ffd8cfdcd7bf8b5916348633d519531a3a50426a03d9aef2818ebc3577c30f54e2e3c9ff1a4e7cfa7ea8cbe48a08c97262a796fead873128eb70d3074807a994 SHA512 7be64a4f8df874b392b3d75ecb16bb4e4f689e2c9e65eb406c7287bd637eced2c2580d27be3cfa164aac9cdfdd89cb8aaa8d9ab708e44542a478ec76a9b5955d
-EBUILD http-attoparsec-0.1.1-r3.ebuild 830 BLAKE2B 03de6e1a90e584f52ab769f8e827bf28be4a46e3d3a26151b01c09c8611a3f3e31eb513b7e72c043047f37b106433d5588c3221ffd29a35f2d3a5b9b2a3e048b SHA512 d88d23b9dedcf6e747d0d330c9c45bf2259a93130464deb54271deffbe37a04fdd705bd9505f84acb2a2a76168efecd653f84d320bf000c19ecf2f8b9e185f41
-MISC metadata.xml 339 BLAKE2B bc97f6dde18fa3f6d0edba74e80d539bca13480a8681f253dd7ca5cd2186d9c59a450a0f23a7589eaa2c3c3aadb17e54a272692133257ecd1b700243c0a78e23 SHA512 0bb5aaff71d3e482bcaf986bb2a97ac79ca87950ea37a9039f642bef00c8ae40af558126ef5b6d80351cb918ec36ebbbb42de5a0dffa57b5dd3c7ea5555ea24d
+EBUILD http-attoparsec-0.1.1-r3.ebuild 842 BLAKE2B 7ed6a2aa608fa1c9b70594ab746a592485aaea18f34bb7553cee8ddc192bb9e019b84d2acbdd0bc773ab24aa233bc2c2a50ef02377409993d18a1c99da76e732 SHA512 7c0d4921b58e332b7f20810fca5e658312c789be7dbc39cc5dfa120a0b163f3b0fb08191df60d2f2362d56044cb0c4346e7e36be158cb4e98f4db3c6d740661c
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r3.ebuild b/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r3.ebuild
index a91815382e01..cb6d745f57bf 100644
--- a/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r3.ebuild
+++ b/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r3.ebuild
@@ -1,7 +1,7 @@
-# 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.3.6.9999
 
@@ -25,8 +25,10 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8.0.2
 "
 
+PATCHES=("${FILESDIR}"/${P}-http.patch)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-http.patch
+	default
 
 	cabal_chdeps \
 		'attoparsec >= 0.10.4.0 && < 0.12' 'attoparsec >= 0.10.4.0' \
diff --git a/dev-haskell/http-attoparsec/metadata.xml b/dev-haskell/http-attoparsec/metadata.xml
index f9ce57be06d6..b7878815d80d 100644
--- a/dev-haskell/http-attoparsec/metadata.xml
+++ b/dev-haskell/http-attoparsec/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">tlaitinen/http-attoparsec</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/http-client-conduit/Manifest b/dev-haskell/http-client-conduit/Manifest
index 987254581470..330bbd8b48de 100644
--- a/dev-haskell/http-client-conduit/Manifest
+++ b/dev-haskell/http-client-conduit/Manifest
@@ -1,3 +1,3 @@
 DIST http-client-conduit-0.3.0.tar.gz 1176 BLAKE2B 29a8da8e051c31b24c710db783d330eb25316f500968df8b546cf085ca179526b26f1709d2e05cfb4d32703cf1233a8b9e9d0e0b04bc66b15fb38bbf6ce1ae7b SHA512 c6d3a2ee7d2b3efca346835d226421bf18443d7248d743b0467b32a9697d845697267a5fa9ee5a7bdf2c6918c60f4f6897f3df109b9337ab3967b3b9ef2528fe
-EBUILD http-client-conduit-0.3.0.ebuild 621 BLAKE2B 08640c220e0891e531998d1f5e0ab3f17086e26080b64c438aa32e83cbb9eb89b57c9d5433ea5dd6f166ac0339a4067da76351230130765de319de1abf9982fe SHA512 40013001f2bc5332e714fb41e7eb5f5221ee5c4ae33c64dc1664ba368e898f1ad153199d1eb1ca45e577700a7dd0089f56a96978d300e64d918eb533b59d9750
-MISC metadata.xml 334 BLAKE2B a13cbd35e85318b7f22c04dabd6527b5b1424a06bcdc5e0ba6f51d488427d1fb68aa6114e244e15b7deb2cb8e483cc2621780a7b34a03ad5911e9170a0397e8e SHA512 d3764ee3364492efcb58967bbd9719dd67bbf62b2b9f5529fa5069cf90ff13d6ee9aa34c07b91e2c86e3cd19fd5553c88291709a9fdac01ea41c926da4bdb3f6
+EBUILD http-client-conduit-0.3.0.ebuild 611 BLAKE2B badad63a04007d7884c277cb40f248a38573f7ff14eba5a0664ec58e953713cbc0147a570898a903763830008ac3e65f8c9dd2a858e45101cfa60b8b2189f1ab SHA512 3d9b6563e32338542e4c16323bc50f796cafee03075c543a714c0aa61ca526c3c5efa1fd9a3f03dc79e337f91f525307e182309073dc7f0b555dec069adb4c20
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/http-client-conduit/http-client-conduit-0.3.0.ebuild b/dev-haskell/http-client-conduit/http-client-conduit-0.3.0.ebuild
index 29e32f908c9e..0a4612da0fe7 100644
--- a/dev-haskell/http-client-conduit/http-client-conduit-0.3.0.ebuild
+++ b/dev-haskell/http-client-conduit/http-client-conduit-0.3.0.ebuild
@@ -1,11 +1,11 @@
-# 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.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="lib profile" # haddock hoogle hscolour" no files
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Frontend support for using http-client with conduit (deprecated)"
diff --git a/dev-haskell/http-client-conduit/metadata.xml b/dev-haskell/http-client-conduit/metadata.xml
index 7725db4dc50b..b7878815d80d 100644
--- a/dev-haskell/http-client-conduit/metadata.xml
+++ b/dev-haskell/http-client-conduit/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">snoyberg/http-client</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/http-client-multipart/Manifest b/dev-haskell/http-client-multipart/Manifest
index a350fc834d22..8f7e48619893 100644
--- a/dev-haskell/http-client-multipart/Manifest
+++ b/dev-haskell/http-client-multipart/Manifest
@@ -1,3 +1,3 @@
 DIST http-client-multipart-0.3.0.0.tar.gz 1130 BLAKE2B 016468d0509055776615ba0e23f234f24868557c0b0c8e366e7ef7157028461e8fd5f0af73d84db68179c68c52624a8251c41195342798234c93801e7f7ed0b9 SHA512 4d0985d6cbc5e6ec4fe79b5037a4e378afd4b14382f2b26d62870ac091de661cf80be827851a8a8de014d6cd846867ea54ac7722deb6f97ecd70bee61fc1caeb
-EBUILD http-client-multipart-0.3.0.0.ebuild 613 BLAKE2B c0adbdc4b1c3028aeb3907d24c60af3e852339f5522ec5c3d87059139631be3f09e2901ef6e0dcb03566acacfcda73e9a68cd4057e7cf49dce3a9a8ab298d6ec SHA512 c136542f5a2495692ff7e0bde704446744926d2834bff8c00abd66314701c20dc801e79e1336daa7ad5818bf6cfa1f5d08252f8abfd006364472c0ec776e26a6
-MISC metadata.xml 334 BLAKE2B a13cbd35e85318b7f22c04dabd6527b5b1424a06bcdc5e0ba6f51d488427d1fb68aa6114e244e15b7deb2cb8e483cc2621780a7b34a03ad5911e9170a0397e8e SHA512 d3764ee3364492efcb58967bbd9719dd67bbf62b2b9f5529fa5069cf90ff13d6ee9aa34c07b91e2c86e3cd19fd5553c88291709a9fdac01ea41c926da4bdb3f6
+EBUILD http-client-multipart-0.3.0.0.ebuild 603 BLAKE2B a175bbd1090c97b04b7ee5ce2150431be5a74fe9d4c7ec238f055d7a82f02682d98cbd2fd4323b29a4c5e1e9e5ff11117c1f435913db7005e06aaeb280528cc1 SHA512 f11fa5e9bf7fba8545dd45a206c4aed01f58496e8afe855cdb44d6ec4342d61c1d518b35be2990bebeb1d3c417b75b722e6ec78a99f8b5ec3cd25181d93244a8
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/http-client-multipart/http-client-multipart-0.3.0.0.ebuild b/dev-haskell/http-client-multipart/http-client-multipart-0.3.0.0.ebuild
index a0211fe3e469..97cdaf3071b9 100644
--- a/dev-haskell/http-client-multipart/http-client-multipart-0.3.0.0.ebuild
+++ b/dev-haskell/http-client-multipart/http-client-multipart-0.3.0.0.ebuild
@@ -1,11 +1,11 @@
-# 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.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="lib profile" # haddock hoogle hscolour" no files
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Generate multipart uploads for http-client. (deprecated)"
diff --git a/dev-haskell/http-client-multipart/metadata.xml b/dev-haskell/http-client-multipart/metadata.xml
index 7725db4dc50b..b7878815d80d 100644
--- a/dev-haskell/http-client-multipart/metadata.xml
+++ b/dev-haskell/http-client-multipart/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">snoyberg/http-client</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/http-common/Manifest b/dev-haskell/http-common/Manifest
index d371d73c4e3c..9a2276ed4faf 100644
--- a/dev-haskell/http-common/Manifest
+++ b/dev-haskell/http-common/Manifest
@@ -1,3 +1,3 @@
-DIST http-common-0.8.2.0.tar.gz 9473 BLAKE2B 7c37f7b605f3014d15d7b89250ecad915acb79ee1c246f3410b2c206189a64fd29a6adfc1b57c05f3a10cf22b8edebf899cea71e37b5ffdeac1702be615644a6 SHA512 e02e9b08235483220856ed1cacebea1910ec41451d7ec68b86a2193f5c050f74ef3747a4a2c35c560795727d9f62ee6485cfd1ed5597fb7645ce6339f969851a
-EBUILD http-common-0.8.2.0.ebuild 853 BLAKE2B 7819d03dd1b53787ea66da2474d3e5da1fbfac472d46fec634554242da5604964eafc0d23c9e4fbe0b2a6b6b71697ffe9e3c5955153e714127f547f69995587b SHA512 760d8e20fd30baeabc3f66e0e20a7bf1228fa68ff2da1378ab926714cbfd649394cfb176629b0ab2d713444148fc97cd1afc74770745bb29d1f58ac7d59535c3
-MISC metadata.xml 599 BLAKE2B 8087c1a7abe5ba1ed5b23d87425dcb196fdb6f19658d9c0bf26f9446176dfba35702ed3d3bf151562363422819ddafb044fee82a370b9eb45078ffe0c8657b5b SHA512 4feaa9c2215dd5d320a3c4dcd520487c0d5df34b0a1a3cd1fc0b5a8bd9333f6c5fcdcae385f854c0baaa058f3ab88a0a844f670bd8d339285e41d5f89016217b
+DIST http-common-0.8.2.1.tar.gz 9413 BLAKE2B 0e79e29f277902ac188ff2ba962f9bd3ad99d21f70a9f9f9e6ad5951d9af353110dd1a7519f77d0fb593aa965cdfd08be8abc01b27ce9fcc82e37a696dc790ca SHA512 da165d118575f1958c300c2b389b28cd4e0d720be79e776b5e72444b30b7b0369f336d44283d8b71c7758c1405e64a13e5591971da2e6b29cf7786233f2e04dc
+EBUILD http-common-0.8.2.1.ebuild 807 BLAKE2B 18ca9453a2bc2bebc36a0e7872c29c1b3f9349b72a3269bcaa6c1e622456c07ef1773accdb625fe17a43d9febe0ee651440caabe263b0bb821cc58554e1da560 SHA512 9cc6d355490ed14cc446715eb335a9e64c40348fea3680edecc6e070d0f7901b90efe4142cb2f7826423dca1c9a2263f945aa7a02960238e0a8f73f378044f58
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/http-common/http-common-0.8.2.0.ebuild b/dev-haskell/http-common/http-common-0.8.2.1.ebuild
index 0ff6f6b7c8a4..e0fe46eedcb0 100644
--- a/dev-haskell/http-common/http-common-0.8.2.0.ebuild
+++ b/dev-haskell/http-common/http-common-0.8.2.1.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.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Common types for HTTP clients and servers"
-HOMEPAGE="https://hackage.haskell.org/package/http-common"
+HOMEPAGE="https://github.com/istathar/http-common"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -23,10 +23,9 @@ RDEPEND="dev-haskell/base64-bytestring:=[profile?]
 	dev-haskell/mtl:=[profile?]
 	dev-haskell/network:=[profile?]
 	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
 	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
+	>=dev-haskell/cabal-1.24
 "
diff --git a/dev-haskell/http-common/metadata.xml b/dev-haskell/http-common/metadata.xml
index 9b125c84e713..b7878815d80d 100644
--- a/dev-haskell/http-common/metadata.xml
+++ b/dev-haskell/http-common/metadata.xml
@@ -5,12 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		/Overview/
-		
-		Base types used by a variety of HTTP clients and servers. See http-streams
-		"Network.Http.Client" or pipes-http "Pipes.Http.Client" for full
-		documentation. You can import @Network.Http.Types@ if you like, but both
-		http-streams and pipes-http re-export this package's types and functions.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/hunit/Manifest b/dev-haskell/hunit/Manifest
index 606f3e359ce9..26ed767945d2 100644
--- a/dev-haskell/hunit/Manifest
+++ b/dev-haskell/hunit/Manifest
@@ -1,6 +1,5 @@
 DIST HUnit-1.2.5.2.tar.gz 24889 BLAKE2B 7dcc49f58cde674a5555a064bcb16d73925f31cde251acc245e5c288f536550e44c465c5bff778413db180aeba62e5f1d05df25bda193e2523264d2de33e4659 SHA512 ee16c33faacc1c26e242095823ae8df47889946a6a161affab3789d7f40b423d2f002526f6cad018084dc7b151a911cf28b37b2aeef91d186bb765e940534fc4
 DIST HUnit-1.6.0.0.tar.gz 21937 BLAKE2B 7c61d812206097d2c391f13ee9e5ccd05b12565cf43f011deb4f60f8d118e79506adb860f2b5cbe91c5d938097b81d4265a4a3fd39b9d9a8be6c40b5dcf404ca SHA512 06503884bb85733be05b82da1fcc47e5b81122c3a3959ef047acbea2df1338b4f4589479b46daa6a0d554c7cb06b8cf1712462a3496db22cec5621e878467120
-EBUILD hunit-1.2.5.2-r1.ebuild 631 BLAKE2B dba40eefacab74ede63938160c310a0cd6a411f533cce9fade455376c33f5000bbac0cc33ad628c3e99f6d3d92ecbbcd37782917cfe333758cc98caf16298ac1 SHA512 abaafa3869f8490d698eecc88eb34d5357be5343dc45893fe6a5005ef0d4baceda98cc795ff9284d4c828334837a605dd695a504f6fa5cafc34a5476ba3598a1
-EBUILD hunit-1.2.5.2.ebuild 630 BLAKE2B a8358fb8ab61d7dc07eafef0647e99ffc17d4cd097dc13a2984188cc81d685bb634f00aa7552c987b3bde656f838c1a5edf8e67c0024835d2b2525ea69cf0d36 SHA512 b67701847bab5a9977373ca0ad2809743ec20029aa7d5b0eb970ec4ba33c561618085d65c551dc2b20e78696e485f468962b7e4d5e1aa44512046b79d71e7dcb
+EBUILD hunit-1.2.5.2-r1.ebuild 631 BLAKE2B 90e2773473cf16795afa58dedc750b50b3e2c741ace110398de3186852272bd8c7e90ab2d52eb3513c0ad923aa85de74cada7e97eae907ef0cc2e0780ee457bc SHA512 80a45671f53b05c598ca0003d317a5a3da3dc60e196e7f67918e6e2ac1c218f7563813dffd5969e39a4da435bdef09ba0404631b50ef29bcb5af86273ffa894c
 EBUILD hunit-1.6.0.0.ebuild 652 BLAKE2B 472fce29515d2d1203e7fc7766d2b5f59103ac02a76e3b96f51caa36c8ac38fde84dea1c8d82a0ce2ca382f1ac57505600cc435d29ebc331354176f05ecbd4ae SHA512 e2205f22bfcaf6c6781a01006ef89d5a39c7255b03a0b9941ebae6eecd4ca2c1968205d36c36e877ed0cdb81369efd6f8cd0da683f9bc33a4de9366f907921c8
 MISC metadata.xml 486 BLAKE2B 18f74bcd495eefbadc28cd818bc80f712da01f0380894f098bd6ef646c79e478f99656e83e5e5e0da503bd05e994fbd2dce8ee3c621b8684f059644f1302c340 SHA512 b26653c15af05b613bdd1b8a7743f6570800bcec2deedd3632d9d2bab3042c2ab5928a58fba2d355890f7250b4682c1a7122bae82207291d1d5792c114ea95bf
diff --git a/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild b/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
index 203a94bb6bd5..ee1f2c301ed7 100644
--- a/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
+++ b/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
@@ -1,7 +1,7 @@
-# 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.3.2.9999
 
diff --git a/dev-haskell/hunit/hunit-1.2.5.2.ebuild b/dev-haskell/hunit/hunit-1.2.5.2.ebuild
deleted file mode 100644
index e0d86354a4a0..000000000000
--- a/dev-haskell/hunit/hunit-1.2.5.2.ebuild
+++ /dev/null
@@ -1,27 +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
-
-MY_PN="HUnit"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A unit testing framework for Haskell"
-HOMEPAGE="http://hunit.sourceforge.net/"
-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 ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hxt-charproperties/Manifest b/dev-haskell/hxt-charproperties/Manifest
index 80a732bf1810..9c47c6175923 100644
--- a/dev-haskell/hxt-charproperties/Manifest
+++ b/dev-haskell/hxt-charproperties/Manifest
@@ -1,3 +1,3 @@
-DIST hxt-charproperties-9.2.0.1.tar.gz 270767 BLAKE2B dce70cb87f1fa09ade7a4b62a3d016a6030f6de13f090195c91c4f14fd0434a2a81742a345caaa0e36b5e62b2ca1e053df56d88abd6f36165646e29da7134bd2 SHA512 518d7c15b43a33432c402b839713e1d29a60d44286ca411bfb3d9a4b955b1181b8ec84615a131db0113280bea7973c70618f4204a32b21e627c452e05a18a7ef
-EBUILD hxt-charproperties-9.2.0.1.ebuild 544 BLAKE2B 0aa18f31fa1d2ef795706c07359d850dab4ef3571706ca4d9e320b54efcb9ace10686c1f53fcff93c4562517018ceae90773e5633cfc1cb1ce9101bce5978255 SHA512 ca29ff1e0bbfd68a8b8c6864f1cbfd547d9f3c9a0ff52eb724753608d9a4e6d6f9870ff67fbca0ba6c552742d084383ab2816ba9f24ed2903e63e4693beeef48
-MISC metadata.xml 581 BLAKE2B f4b8e35776feb9f8b8f694c85414f936eb16ba5cb43d57e018e12f25ebc29f87e8324cd6aec9811e63ec35defec9cf3d3e32918af0077012677551a2329c3954 SHA512 bf36ee1feade57b7b7d4426ef5f38d3773ce0fa36bc7bec3ec1a222d8ada450bdca1d6352be1f006b7e93ecc8108f7535a0e4bc9866715ac7f9b2db96a8c8739
+DIST hxt-charproperties-9.4.0.0.tar.gz 317043 BLAKE2B e8ea482090b0496a1064720e81cab04fa64be51486dedae6b418ea2386b5dc91d0b08af3d57a5c1b52206c6c76ff0b23c380dd03aa0bdfc1e84a80fb2317411b SHA512 8885ceb06e402f2e2e31d616eb605ddf380bec771edf4112fdf6875cbbf03cf1a88b5466e4b74270c7ccf0e1c04e335a3ded6867133a951e1070b7635976fba6
+EBUILD hxt-charproperties-9.4.0.0.ebuild 646 BLAKE2B 40aa645f0292e0d1e588705cd0640311f00be44a00dfcf303ca59e6a95ed3cd52138f4d85aaa20f46023609aa768ef6d923616ada281adf6e35bedf8808e63b3 SHA512 dab6f04144a192c108577028d80071643750ae175da01353d4a0860350afcb2eff16db9d7398adc5683ca34e173b4b67781def0d86e007659267190b65f770f6
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/hxt-charproperties/hxt-charproperties-9.2.0.1.ebuild b/dev-haskell/hxt-charproperties/hxt-charproperties-9.4.0.0.ebuild
index d1ce0f15526f..1cf7512f4d2c 100644
--- a/dev-haskell/hxt-charproperties/hxt-charproperties-9.2.0.1.ebuild
+++ b/dev-haskell/hxt-charproperties/hxt-charproperties-9.4.0.0.ebuild
@@ -1,9 +1,10 @@
-# 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
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: -profile
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -22,3 +23,8 @@ RDEPEND=">=dev-lang/ghc-7.4.1:=
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6
 "
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-profile
+}
diff --git a/dev-haskell/hxt-charproperties/metadata.xml b/dev-haskell/hxt-charproperties/metadata.xml
index 24b0e65dc8d1..b7878815d80d 100644
--- a/dev-haskell/hxt-charproperties/metadata.xml
+++ b/dev-haskell/hxt-charproperties/metadata.xml
@@ -5,13 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Character proprties defined by XML and Unicode standards.
-		These modules contain predicates for Unicode blocks and char proprties
-		and character predicates defined by XML.
-		Supported Unicode version is 5.2.0.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">UweSchmidt/hxt</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hxt-unicode/Manifest b/dev-haskell/hxt-unicode/Manifest
index d7ac0d14ce73..652d87b7dd43 100644
--- a/dev-haskell/hxt-unicode/Manifest
+++ b/dev-haskell/hxt-unicode/Manifest
@@ -1,3 +1,3 @@
 DIST hxt-unicode-9.0.2.4.tar.gz 14010 BLAKE2B cdec42564a1107f1a1d322cb22a1f5b74d2bed6e3aaa04ca2973ccc0d6b02b98c18faa86ce92881ad9229b60d2f29055e4cdaa2a2e7002fdb7b9e25133f35dc3 SHA512 4daab9c754e05e15bb0f32bce4ccc0c581c6d8dd4ca4d4868ca7b756a6e40cc9ae8890fc3c925b63bb419db0354229ca6e61fa96bec048f0c61b3ebb43d212bb
-EBUILD hxt-unicode-9.0.2.4.ebuild 659 BLAKE2B d1910a25b8c6cd301d667b19523f20aeb635bac05cca86628e7a7ce84b627d16aa123e85278dad13cbb0e4d24ed13942f8d3485b3eea5c333f39f8205f772411 SHA512 2d674dd9e1ce9c3051ea387e880109442f4d26472074c0cc3e8d603308d6d871e66378ebf4bc16a7bcf919bbf2be07ab49ac18fb5173b55888273dd13c066329
-MISC metadata.xml 622 BLAKE2B 0cf09176e3b65b91ee8de08aaab63e5af30fddc38a5f1e8ba17558a4299675986cf206f47cce8942e73ef638e0d51cdd1ea722ed02141bcc831d78a20831a3d6 SHA512 243c6959ca0b2ec26f156f54f1fcd264de7c0aabc9a28f47660f3eb2f097229d41cf972ff6b065a74b094f2971155b90ca968d9941aab811a033109992bf3948
+EBUILD hxt-unicode-9.0.2.4.ebuild 664 BLAKE2B 1b7fc3aacd4b0811a943a675d3731119e273fffae8e279292438ecd735fe8081158a1ba9d680f1ce2ba4d29c398132b4757310fe9c1f1140695058818ce04d99 SHA512 25bce34c9c10d3ff403ae41c0b25eadaa0e65273ed158a194025ac96d00d357d77b275995a23a1da4cf88a3408116e1c7601d64a5810b0874108966785e16133
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild b/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild
index 26e2c4187699..59bc1eeb8078 100644
--- a/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild
+++ b/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.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
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/hxt-unicode/metadata.xml b/dev-haskell/hxt-unicode/metadata.xml
index 73c4decb1fc1..b7878815d80d 100644
--- a/dev-haskell/hxt-unicode/metadata.xml
+++ b/dev-haskell/hxt-unicode/metadata.xml
@@ -5,13 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Unicode encoding and decoding functions for utf8, iso-latin-* and somes other encodings,
-		used in the Haskell XML Toolbox.
-		ISO Latin 1 - 16, utf8, utf16, ASCII are supported. Decoding
-		is done with lasy functions, errors may be detected or ignored.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">UweSchmidt/hxt</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/iconv/Manifest b/dev-haskell/iconv/Manifest
index a9eaa7fa99bd..7503f999c421 100644
--- a/dev-haskell/iconv/Manifest
+++ b/dev-haskell/iconv/Manifest
@@ -1,3 +1,3 @@
 DIST iconv-0.4.1.3.tar.gz 12706 BLAKE2B 569b61bc426115feaf321cb52230460d1cc66472e2fa18678a16e5486a80b5df698e2fece746371268d7031d82268bee98f15ae1713b9589b42f54b4e9cdd0e5 SHA512 b5541bbf477572f7546fa804a33243f5d126c6eb57d0fc12abd85fb9fb19dbb10a79cca60054c585845c3b755d2d5d021413d9aca4db63f5b0eaa52bba87d588
-EBUILD iconv-0.4.1.3.ebuild 531 BLAKE2B 8f4601e864a3924788ba5703716c24d636f5451f5f036ce51c960765e5590a203d4560c3c48f358839ab9eecf95de886d32c1ed7af89019ac9b5795b46ca11fc SHA512 84b9ff94d2aaa993610d6308d500c40a16bbfc886fcb4e64e75a719c584b137e2da17a21dc62b3c5587fc505afd776d8eb815a5a48bc9a5587f7a51892cd562d
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
+EBUILD iconv-0.4.1.3.ebuild 531 BLAKE2B e8df271e25d71086c7f66420993fdba0a0b6b5438c5cbceafa663c77388cd66b4376583030efe1c180b1cbea4cf29d2151cf9e70fbc96d543c23c4376a110f28 SHA512 26aab96e674c36daa9de666936c82bf1ecd1eeb89f7b1fc568137793813a0711853db4bbf5453fbee8f83f12389042b925e9be59778aa00724f52ef078eac1e1
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/iconv/iconv-0.4.1.3.ebuild b/dev-haskell/iconv/iconv-0.4.1.3.ebuild
index 39168dd1d6a2..7b64368b5d70 100644
--- a/dev-haskell/iconv/iconv-0.4.1.3.ebuild
+++ b/dev-haskell/iconv/iconv-0.4.1.3.ebuild
@@ -1,9 +1,9 @@
 # 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.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/iconv/metadata.xml b/dev-haskell/iconv/metadata.xml
index 522384de8446..b7878815d80d 100644
--- a/dev-haskell/iconv/metadata.xml
+++ b/dev-haskell/iconv/metadata.xml
@@ -1,7 +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>
-</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/idna/Manifest b/dev-haskell/idna/Manifest
index 30f33a1755e3..4cf906e749a6 100644
--- a/dev-haskell/idna/Manifest
+++ b/dev-haskell/idna/Manifest
@@ -1,3 +1,3 @@
 DIST idna-0.3.0.tar.gz 2352 BLAKE2B d4b0441c22b14d5e87438d3e39594e44943aaccc70ee4c66eab70146067e7a1a0c358e94cd68251517fcdbbb2b14f896441a6ebfccd764b31c342d82b8e79b8f SHA512 c18bd9e4157abfde7fa30a16d0df432745f04ee784a2d2be3852750d989964a77bcfc8cc34ab8629a0bb25686adacc07f510150f9696a926559964e6a724f98f
-EBUILD idna-0.3.0.ebuild 689 BLAKE2B bfcd709909f008b9924a5dae6a6f37468171eb8471487bbacb714a35c4372f063a18f3922807d5cabb71bdc3032a6a85a5f41cd3a0382308b8f14f73690d892b SHA512 26b156aacf00f00430ac9dd7db10c394c2ba99cfa47d87bda71a64c6f16914685cb86ce1bcc60a38217947584da06727cba6e610f35c02be19990b6dde395b1c
+EBUILD idna-0.3.0.ebuild 684 BLAKE2B c03c5fcc9f0b9794024546facfe6bd320d0782193a64d5497641befbf090ef10c15d47ade4d55e3a04acec91aebdc958836abdfdad60572a531c4cb0a5824db3 SHA512 76da91bca9182fcf211d5fd86b2ab41fc99ca34b93d90e8dfaf92611edcdf811e18143c0b1a5ce77c2a7d99cf3e9980b7483c160e9685319c0e8b8870270f807
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/idna/idna-0.3.0.ebuild b/dev-haskell/idna/idna-0.3.0.ebuild
index 6a58f9316aa5..6f9e096fad03 100644
--- a/dev-haskell/idna/idna-0.3.0.ebuild
+++ b/dev-haskell/idna/idna-0.3.0.ebuild
@@ -1,9 +1,9 @@
 # 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.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -20,8 +20,8 @@ IUSE=""
 RDEPEND=">=dev-haskell/punycode-2.0:=[profile?]
 	>=dev-haskell/stringprep-1:=[profile?] <dev-haskell/stringprep-2:=[profile?]
 	>=dev-haskell/text-0.1:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
+	>=dev-haskell/cabal-1.6
 "
diff --git a/dev-haskell/ieee754/Manifest b/dev-haskell/ieee754/Manifest
index cf92bc379e2f..8fd85edcc1ef 100644
--- a/dev-haskell/ieee754/Manifest
+++ b/dev-haskell/ieee754/Manifest
@@ -1,3 +1,3 @@
 DIST ieee754-0.7.8.tar.gz 17290 BLAKE2B befc4e9f5f1b69a6ad29a2bde915a6f9115a307419d903db6f4cb4108f3556d5475805f997e31212f580ed859c45e3019c55c0fd1ce8ec3bbf0d1892b04fc091 SHA512 662ed7c68797164ee5f0cd3132da96d8d9032aa23037d57636281fdc4952a7c276f92deb032db60663ab1c71311fd8d3088265fc03f772f271dcb659f3e9b866
-EBUILD ieee754-0.7.8.ebuild 558 BLAKE2B af1db71d49d17bbce6aa1c88ad2f6b958236f45752d2fb7235b6b1404e7b8916fae9b9a77ade46d27cdd0877955c10643eb1a6e08fc93c681f2a43f970359c77 SHA512 7304fcc67a467853fd1b3740debe57f3a02af6867d5c4b3c5ed64b18ccc7e6e985719d4b54679d9f5deef621f17e092a62befe56ee592c1385709f720f8f52bc
+EBUILD ieee754-0.7.8.ebuild 558 BLAKE2B 7b88b011524cc30aff34399f88ad131ae9d7fa03c1e142ba73dfcda39852ba652e68b34639da61e437d4fa04c8b717db217c62179a2b9f2209a272277a35c11d SHA512 57a6351bbec899e5bbe016e69b8bfb311451b1d3739f200847777e21224e1d6a71f3111b3cb7521640d7540238938f414e7f36ae90c9e0ebcea27f0387115467
 MISC metadata.xml 530 BLAKE2B c282b2c29c47cfafb543d0ec17d0bdc2d8890f148212e270457bbab8cfbc09dedf76f8ef8cd303b1db0c27eb2c2341d66c1209de50f6fa4d390c68ea8cf5ce2e SHA512 308fa2e606307ae9c8d10b5424b533e4a99046cc2f3d51acbc9322de9049bca5ac97597e535b02d2c6e7d329202ebfe26cd614994f2f9a31a92e2755134b1fbb
diff --git a/dev-haskell/ieee754/ieee754-0.7.8.ebuild b/dev-haskell/ieee754/ieee754-0.7.8.ebuild
index 60c63f3a23e9..a2ba2fb33338 100644
--- a/dev-haskell/ieee754/ieee754-0.7.8.ebuild
+++ b/dev-haskell/ieee754/ieee754-0.7.8.ebuild
@@ -1,7 +1,7 @@
-# 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.6.9999
 
diff --git a/dev-haskell/io-streams/Manifest b/dev-haskell/io-streams/Manifest
index e5c88147c964..dd783fa3fcfc 100644
--- a/dev-haskell/io-streams/Manifest
+++ b/dev-haskell/io-streams/Manifest
@@ -1,5 +1,3 @@
-DIST io-streams-1.3.6.0.tar.gz 61651 BLAKE2B d71a5ba3d264b98d3284470021fc1d9622700b37ef1a67142d12d4d6321233eb28ad5274925e08f9d0c251ee77e25e2187c811d197a9f7b68e33479d8ea602ab SHA512 9ef5a2daa43600796b48104771c71d698f40e29def536e785421b53a310683e7db202b254310a0a5f2d1fa507dcad27c25f328c64fffe796c06d4c0d98ca982d
 DIST io-streams-1.5.2.0.tar.gz 63812 BLAKE2B a555bc0bc365e4e2c28570da34e6c2891ff56a7460ec8a857285a22ea3a4a2b8975139c3024fd90ffec51386646d9ed632754971abef04fd2c358cba5e0a19c6 SHA512 2cb6c9cded0077f1501b0fba576b79e5ebf21ccc2711a91552ec46ef6d5e943e0c1255cdfda381aa8e4d7691b1e450956bedd2fbd4414b13ef7926b0cc3dc4c3
-EBUILD io-streams-1.3.6.0.ebuild 1713 BLAKE2B a447004066149aa2af3c04caaf18375884571a4b617fdb9e0b8e8b4cf1151abe29febc72a99676825db34758176844eef41a7ab86b0c132ddbfde5a3a51a95f2 SHA512 c6416ae501b123f6310305dc2a19d3f56359bc9d951310bf993b0c02f6785324875473662e0c4b811d79186d370c6eb88141fa1a35a9aa5e4af60c7ba981b3cc
 EBUILD io-streams-1.5.2.0.ebuild 1863 BLAKE2B 7239468f7bb1b4523aadea960743b25ed33bc764e1ec16d167281a7ead27a30553b600bce45d179940dd1f4d4cc47fe2bbbfa73be1bef0ad7a81702a6ee2cef5 SHA512 1e7037f2b0c55ffd1529e89a53bee05b3716511dc7b513e761c8f53ef11b9f50a9c1fc680e23e3b282cf073d8cff80bb38f2715d2533a282a11d985107c5c387
 MISC metadata.xml 2707 BLAKE2B 7f0a861b73b99dd2b03082dc8eb4302491a087a86515ef1fac00e94ceb234bea85359c8cba2bb35895f78e94e68bad896f814a8add92e282faef8000d011af9f SHA512 9b7c8d5124b259fd742c9fbeaf3dee464742a7ab51c48aa00bc09f2795523e37c0d38a204513e5ae3c3ed8addad7b3ad8abcd03f6b1a56f581dff122a572d772
diff --git a/dev-haskell/io-streams/io-streams-1.3.6.0.ebuild b/dev-haskell/io-streams/io-streams-1.3.6.0.ebuild
deleted file mode 100644
index f13a265b1537..000000000000
--- a/dev-haskell/io-streams/io-streams-1.3.6.0.ebuild
+++ /dev/null
@@ -1,44 +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.1.9999
-#hackport: flags: +nointeractivetests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Simple, composable, and easy-to-use stream I/O"
-HOMEPAGE="https://hackage.haskell.org/package/io-streams"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	>=dev-haskell/primitive-0.2:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/mtl-2 <dev-haskell/mtl-3
-		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=nointeractivetests
-}
diff --git a/dev-haskell/iproute/Manifest b/dev-haskell/iproute/Manifest
index 2e4e56bb295d..c16d74ef2a4d 100644
--- a/dev-haskell/iproute/Manifest
+++ b/dev-haskell/iproute/Manifest
@@ -1,3 +1,3 @@
-DIST iproute-1.5.0.tar.gz 11570 BLAKE2B 19cf5c0ba07e9f4a8dca79c60ce651ee3a3d30060c0be7bf56e34102a73e83726986a5c3998a637a29be8ca4ae5e414547c355fc3c36a5c74662f73bcb9e17e9 SHA512 bd7b7cd04229920c39e874bf0a76d8628930fa37ba3d68803275bd9ca30eedacc85d76dd7bfa0536fcf1b84185270da0f6d3ab5b0be26cc5c6606b4199c07845
-EBUILD iproute-1.5.0.ebuild 728 BLAKE2B 5c40dbb918d4215ddcc303b05c173c6c0c8ee605c24cb397ea4b801693dd03a05ccd3f1bf4fefe5a45eb69ee84b44b7d3f3521c8a824c0f21592c632a29c0fcd SHA512 ebb04a6c1426144b78889e6b56936a4b891f5cde5e7f6b670328f691f0e95de3b51efd5d6f2b856c69db39837ea8201c7a61bc088d79fc31ebe5a0e303b3a009
+DIST iproute-1.7.8.tar.gz 13309 BLAKE2B 8d6bef341643e4f096399fcba595e339d63b056aca086434fdbb906688c5720fb556ac17cbaf0c0ff851bd44133e97643a03f35db837065268f0d791222616fa SHA512 ee1bd24a560ee73757ca71eda70a610d5c8e01101c22835bbef23ec7a2217ed66a37b49d5fc3042f3df0e943aaeda2a050e75316ff2ac11602b745cbf7d7ca6a
+EBUILD iproute-1.7.8.ebuild 843 BLAKE2B 577cb736e76ad59d96461358f9c502b83ced9567a2e20f3c307b3ecce9cf17a0fd3684de7dead25b39b68cad1983ab69ed503ef0b879a5d505e81280f7cd92ff SHA512 053d3ad2c6cf345b256664fdcdf001abb25572c211989e784c6f025db76658257f188e598922b0c84bc95010747917ce4bb64eea0f0ebe5826330b4ac665e452
 MISC metadata.xml 474 BLAKE2B 47e855ebc75d9d58cbe8fa1d8eef3d6fc4a201b2fab9573d0e82f13bd84e3ec30272fbc3b8be3b9df1a43c67a2534d0812ebbd4ae6fd95d81edc12d94c963c8c SHA512 ebd8a344867c198db4fa9e1f52f7cd3969a003ece03878cc91f331fe84a1a63f39cf3b3793d57850eaff92a5d97b772e0c00c443022edb08f2b118c84869eab6
diff --git a/dev-haskell/iproute/iproute-1.5.0.ebuild b/dev-haskell/iproute/iproute-1.7.8.ebuild
index 2aeed211ce2c..493de60c762f 100644
--- a/dev-haskell/iproute/iproute-1.5.0.ebuild
+++ b/dev-haskell/iproute/iproute-1.7.8.ebuild
@@ -1,15 +1,15 @@
 # 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
+# ebuild generated by hackport 0.6.3
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="IP Routing Table"
-HOMEPAGE="https://www.mew.org/~kazu/proj/iproute/"
+HOMEPAGE="http://www.mew.org/~kazu/proj/iproute/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -17,13 +17,16 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+RESTRICT=test # Ambiguous modules: byte-order-0.1.2.0 byteorder-1.0.4
+
 RDEPEND="dev-haskell/appar:=[profile?]
 	dev-haskell/byteorder:=[profile?]
 	dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
+	>=dev-haskell/semigroups-0.17:=[profile?]
+	>=dev-lang/ghc-7.6.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
+	>=dev-haskell/cabal-1.16.0
 	test? ( >=dev-haskell/doctest-0.9.3
 		dev-haskell/hspec
 		dev-haskell/quickcheck
diff --git a/dev-haskell/js-flot/Manifest b/dev-haskell/js-flot/Manifest
index 2eb9d64a3752..6600e4f76fca 100644
--- a/dev-haskell/js-flot/Manifest
+++ b/dev-haskell/js-flot/Manifest
@@ -1,3 +1,3 @@
 DIST js-flot-0.8.3.tar.gz 662691 BLAKE2B d7a8abca7eb8a45fa28da783139f6e672f5557dfc75c1a2b1f41254a3b0e09500f0f1c179b41f76fed456485d4c1db716e51306260c84c090a8779f23b86b791 SHA512 5732938b37e9036156528c0d34cd99b45405db81d1e70b6651b056075ea8d9b616da1ae709c2de1f2f5be044236a3b81fc358d973769fca26993500ff9d0dabf
-EBUILD js-flot-0.8.3.ebuild 573 BLAKE2B bc91336004f784bdf73328d9ecb65e38deb539c619b5884dc03551ea35a9ef5ca7372b9fdff1d83459e02acd6695402a9a2dfbb0f77c31ac3e22afbb782942a6 SHA512 d4a9e0494c8f8d7f85c22fc7531e60106b50d8603f322e06e6c44f43f88816621a4993b987322a4d2300039fc2465f6ca4c5802e5e5a4e87d9a0fb7d33e6f505
-MISC metadata.xml 739 BLAKE2B c2fd38348a54f2004fd3df62afee01dbf9a2977a5fabe58800a77f7b10f3f4762cd04091201a222a2b74b889096a44602211c6f009296206aeca79226da42e0a SHA512 b9b57f50057023e236765794202c089e9c4b39a3c84c41c6f6b6907af55d9e90b66d85a451570cf7b30ac1c2cb115c31f49872a490beae339815afb7d3f51dac
+EBUILD js-flot-0.8.3.ebuild 573 BLAKE2B b2a783b73b04a6b6b934356c37633a217a9bde7cabbe28c5c118ba122eafde0fb03819079bc2528a8c867e28d18b24daab828958124f9e6c5f32ffaa8288c8b4 SHA512 bb3b7253e20ec95a59343f83c6bb634e83ea92a8fafe5a36f099fc229a5b589bc24fe716bc596fc783f3dabbe71bf6ecf57b561d49d46f993e50392382bb15b8
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/js-flot/js-flot-0.8.3.ebuild b/dev-haskell/js-flot/js-flot-0.8.3.ebuild
index 2f00a9e0ad5e..147b2a8bfabe 100644
--- a/dev-haskell/js-flot/js-flot-0.8.3.ebuild
+++ b/dev-haskell/js-flot/js-flot-0.8.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=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.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/js-flot/metadata.xml b/dev-haskell/js-flot/metadata.xml
index 81dc91bb8ff0..b7878815d80d 100644
--- a/dev-haskell/js-flot/metadata.xml
+++ b/dev-haskell/js-flot/metadata.xml
@@ -1,18 +1,8 @@
-<?xml version='1.0' encoding='UTF-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>
-	<longdescription>
-		This package bundles the minified &lt;http://www.flotcharts.org/ Flot&gt; code
-		(a jQuery plotting library) into a Haskell package,
-		so it can be depended upon by Cabal packages. The first three components of
-		the version number match the upstream flot version. The package is designed
-		to meet the redistribution requirements of downstream users (e.g. Debian).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ndmitchell/js-flot</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/language-c/Manifest b/dev-haskell/language-c/Manifest
index aa7432ec4f6d..b50a8e788541 100644
--- a/dev-haskell/language-c/Manifest
+++ b/dev-haskell/language-c/Manifest
@@ -1,7 +1,7 @@
 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.7.ebuild 775 BLAKE2B 018a71b9e12d977ac04367faee3a2c66cf1562858bcbbc499ff9069988918360e22d67d15993ef418d92b4ea9926ec2163d1225c7c7f5bf9a0037b38c2a30d53 SHA512 0f88856a4d79b1703524cd9a47aa2f0f36c42923d822c612d4f727f76b2d1b3fea7d4d44e39920b30fdb6d043e7731d42f546c6e642eca74a7d4bb220ecd794a
+EBUILD language-c-0.4.7.ebuild 775 BLAKE2B f7e191f462ff6c1757f10669310c439a0b03a56fe9ed5927551d65b93e64bfb5ee5526c9ce004a0716ef9c392a9b3c40858b784ad5a999fbad3d66bcb1f71860 SHA512 ef7bf4a3d66ab6f0a136f7a9b5366763b0c7841d25991d731e69ce2e46e936faa946f4292f013463b087fa25e35f3cb0d34158ba91d61bdd21bb27363ed4cb2b
 EBUILD language-c-0.7.1.ebuild 755 BLAKE2B 7f003b4d9cd81e358f13441b0cd5b7b30e0ab1183dfef8e3236bb8316e6b48b86b1543dfc5ce61a0c2bf2319243185f0c44eb8b39b03deb940c9a42d656be8c8 SHA512 e54d69d98c3db00a002c9e07768231ad76b334344c2e8f5e73be2b55229b45b91be3a785426812ef37171574055902c25e5f8e6c1f12e3b131a5309a97bb7397
 EBUILD language-c-0.8.3.ebuild 868 BLAKE2B fb1d114064d06c436cd149ad60bc9f14c0a680ed87a70dd73e31e3c67901c979ec866330a0fa1172e87ea6a860807ef05a4f47781723d05606a20b3cd9a4cfbd SHA512 db22e8e5eaff028367301d0686ed70258a714c4891d5377924487d8e5c35a8736e95b30c2cc3b6203a2e645be9efb5a9eeb0a3e446fc7798d0d5583922e98175
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/language-c/language-c-0.4.7.ebuild b/dev-haskell/language-c/language-c-0.4.7.ebuild
index f081fc43e00a..f1d684f79539 100644
--- a/dev-haskell/language-c/language-c-0.4.7.ebuild
+++ b/dev-haskell/language-c/language-c-0.4.7.ebuild
@@ -1,7 +1,7 @@
-# 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.4.9999
 #hackport: flags: +separatesyb,+usebytestrings,+splitbase
diff --git a/dev-haskell/language-haskell-extract/Manifest b/dev-haskell/language-haskell-extract/Manifest
index b5be899d5ed5..930ba13a0779 100644
--- a/dev-haskell/language-haskell-extract/Manifest
+++ b/dev-haskell/language-haskell-extract/Manifest
@@ -1,3 +1,4 @@
+AUX language-haskell-extract-0.2.4-ghc-8.10.patch 761 BLAKE2B 1565bc0b79d2d45e3f191c0dff11e2552f4665b37c536c29561f0b04c500e4aff8994472f09a6c5780ffa754007fd5e6a4c692aa827e6c4cf10843b1f17b414a SHA512 a8b0f4c1bb17ff160a755a5ca004e16659a051d31d4feb6cac0d91596b69da4668bdfae4cb855f876268d47d5c0e50e1955088f4431004b9b4c6d9a4ad2e2e15
 DIST language-haskell-extract-0.2.4.tar.gz 2458 BLAKE2B 9655707a3195c82d5eda9cfbba150d3a91e103155cb522b0d9e13456e833b5530c808435d915456c230f92c438d2989512cbff956c7fd87493e481d39a53fbd8 SHA512 6408459abf9d531ccbe7d65766d38fcb93f4d3f9c77db1a706231bf6d8ad6f845fcefc4fbb03833f45c74f21f324a44760f3c89ff093c69f1f9999e64344ab4d
-EBUILD language-haskell-extract-0.2.4.ebuild 606 BLAKE2B 9d18a3ec7165b7f952d4e10922af0713678a4917ff0024955a43693c95db69bc1ac32e966c3682a6f8515f6e1409011178dabc5cfe43b61c4f723ca9f995d1ab SHA512 7e4a2702058676c15a66259b89d0ef494b1dd24430f0b8295a7b096f27bcefaf6eb5cbfff7dfb4ed35bb322357373cb0a872268cc28e109959854376254ded95
+EBUILD language-haskell-extract-0.2.4-r1.ebuild 651 BLAKE2B 0e2b5d8b60a1e99cb460b4867615bbfa52a5e9f7bde1df934a9e0b083061a2c8904db142cd52c417fcca9d417977b318dd4aa177f756f7838fc4535866b50ca3 SHA512 cdbcdb39cfccd7987077dbf22b287072afee55ab05f4c4201d6bbde56d41c6718933e78708332ecc5ef6b1a06f91f71903e1e218aba708aec78f0620f5d81167
 MISC metadata.xml 1475 BLAKE2B d0c31fb5b5c0220b46125212f7a40ab7c40f82cd58ab53d5f94931c6359178bd6b0dac93e4adeb8bf96162449cd79a106f4baac8ebbe784c6c088a20db60624a SHA512 bf65c32265a35a538f13bf8d4b2b89003077bdbc3f12ead1b6a8ee35e0d8a29da77bf37af7dfc1c2a2493b4e0d830b2664c6517c609128001065910964b75411
diff --git a/dev-haskell/language-haskell-extract/files/language-haskell-extract-0.2.4-ghc-8.10.patch b/dev-haskell/language-haskell-extract/files/language-haskell-extract-0.2.4-ghc-8.10.patch
new file mode 100644
index 000000000000..0a8dfb93fcab
--- /dev/null
+++ b/dev-haskell/language-haskell-extract/files/language-haskell-extract-0.2.4-ghc-8.10.patch
@@ -0,0 +1,20 @@
+diff --git a/src/Language/Haskell/Extract.hs b/src/Language/Haskell/Extract.hs
+index 3e8958b..43dfe04 100644
+--- a/src/Language/Haskell/Extract.hs
++++ b/src/Language/Haskell/Extract.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ module Language.Haskell.Extract (
+   functionExtractor,
+   functionExtractorMap,
+@@ -25,5 +26,9 @@ extractAllFunctions pattern =
+ functionExtractor :: String -> ExpQ
+ functionExtractor pattern =
+   do functions <- extractAllFunctions pattern
+-     let makePair n = TupE [ LitE $ StringL n , VarE $ mkName n]
++     let makePair n = TupE
++#if MIN_VERSION_template_haskell(2,16,0)
++                           $ map Just
++#endif
++                           [ LitE $ StringL n , VarE $ mkName n]
+      return $ ListE $ map makePair functions
diff --git a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
index ab128e10c2b6..b34e2e9f9aea 100644
--- a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild
+++ b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
@@ -1,7 +1,7 @@
-# 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.3.2.9999
 
@@ -21,3 +21,5 @@ RDEPEND="dev-haskell/regex-posix:=[profile?]
 		>=dev-lang/ghc-6.10.4:="
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.6"
+
+PATCHES=( ${FILESDIR}/${P}-ghc-8.10.patch )
diff --git a/dev-haskell/lcs/Manifest b/dev-haskell/lcs/Manifest
index 4579d154a941..33219326fa93 100644
--- a/dev-haskell/lcs/Manifest
+++ b/dev-haskell/lcs/Manifest
@@ -1,4 +1,4 @@
 AUX lcs-0.2-ghc-7.10.patch 313 BLAKE2B ac278030ef0c00d0d97d5660a078ddc188e38cceaca01a071c606e416a0292507d4880929192d383014870605ff38008923e1a15e79c08c3442dada640cb0b13 SHA512 d1b05ed47d0ce1bcb79af6e180b5955abc6f76ebce318ea8fa0b1195c3d44b8887ec4a4587b1de8b0e8f911f35153950e290654ebbdf407cfaa961d92b018456
 DIST lcs-0.2.tar.gz 11638 BLAKE2B e90201a50746416391156fadb05c67a4432d063294b751b8c48a71541e7567aaad8cc8cdad59c9a58633d8ab72fd917990cab14ef044f2ecb0f9012354add709 SHA512 ac5ac6d9a151be46054f2f56a5927182fe6942e518a04a8c484b02c8caec0506ddaf846f51f5575f1f30d6f0fca9b7b26f16e32675b322d014f8b68db76d5f5e
-EBUILD lcs-0.2-r1.ebuild 617 BLAKE2B 5b8ae4ba44783dfe68d0cddd43deb679d88f02a9cde603c7bed1621cfe41db55b861eaa2381186ecc7c569d37f23f85ea57c3130e6b6d0b32b523f32be07a44c SHA512 3db369a5c18cebae65f5d2ffc512b752ee270a03f43a76abdb72acb965032886d31c2e581434df53555350530a6b509f7cffa6df90cfc6c29abe5ba4570a057b
-MISC metadata.xml 1062 BLAKE2B 7f0e9f42997af8f7fe610f2cfb7532c6e5f9cbf578b4316937995e88140962bc2cd71d74fdd54d61190969f6239a35a56836d721a36360689ec81f2d7aceba12 SHA512 21990dc7fc022fe45ae02ca8f54d4a5dde60097da0b83660c4259a7258b824cd9b71ccffa7fa4c55e39a9bb0f492f5c5c79fcb6c0d0603bdd10e5cfa1aedf0fd
+EBUILD lcs-0.2-r1.ebuild 600 BLAKE2B 131c20ba1b866a9c1db3a07a26840679f94fd89aa8d8004ab9263054e80a9f6f89f127fa2074046f72677aa21051c3d44e90152e2542d368b3239c928853b7eb SHA512 1d5bf41575deaee0e73554a76053c917bb6cec70ab2d708e5cda4f8f117a3cf920d6f0a769270d1f30f58bc59921a4fe5fd90c0d186f717e7bdc76ee7fba7dbc
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/lcs/lcs-0.2-r1.ebuild b/dev-haskell/lcs/lcs-0.2-r1.ebuild
index 7fbefa014669..245d4794375c 100644
--- a/dev-haskell/lcs/lcs-0.2-r1.ebuild
+++ b/dev-haskell/lcs/lcs-0.2-r1.ebuild
@@ -1,12 +1,12 @@
 # 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.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
+inherit haskell-cabal
 
 DESCRIPTION="Find longest common sublist of two lists"
 HOMEPAGE="http://urchin.earth.li/~ian/cabal/lcs/"
@@ -20,9 +20,7 @@ IUSE=""
 RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	dev-haskell/cabal
+	>=dev-haskell/cabal-1.0
 "
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
+PATCHES=("${FILESDIR}"/${P}-ghc-7.10.patch)
diff --git a/dev-haskell/lcs/metadata.xml b/dev-haskell/lcs/metadata.xml
index 7a626927e1e6..b7878815d80d 100644
--- a/dev-haskell/lcs/metadata.xml
+++ b/dev-haskell/lcs/metadata.xml
@@ -5,23 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Provides a function lcs that takes two lists and returns a longest
-		common sublist. For example, lcs "abcd" "acbd" is either "abd" or
-		"acd".
-		
-		The package provides a simple, stupid and (most of all) slow
-		implementation that needs, for inputs of length m and n, O(m+n)
-		space and O((m+n)!) time in the worst case.
-		
-		It also provides an implementation of the Hunt-Szymanski LCS
-		algorithm, based on that in "String searching algorithms" by
-		Graham A Stephen, ISBN 981021829X.
-		
-		Given inputs xs and ys of length m and n respectively, where there
-		are r pairs (x, y) where x is in xs, y is in ys and x == y,
-		Hunt-Szymanski needs O(r+m+n) space and O((r+m+n)*log(m+n)) time.
-		Thus this is O((m+n)^2) space and O((m+n)^2*log(m+n)) time in the
-		worst case.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/lens-family-th/Manifest b/dev-haskell/lens-family-th/Manifest
index 2dc8c2becb57..49a385ab9ee6 100644
--- a/dev-haskell/lens-family-th/Manifest
+++ b/dev-haskell/lens-family-th/Manifest
@@ -1,4 +1,3 @@
-AUX lens-family-th-0.4.1.0-ghc-8.patch 1528 BLAKE2B f32cbeca8419edfe2172312c785f9b17123551028276e0a141aa8e649846660b22fba64781819062a255a711c12635a9e432d199011d63c12d52086e0828f82a SHA512 752aaae5a9a174a67329a16e999a4e1606da1ed11c1c3244d84b07171cfbcb2384f5015ad6f57b718733878a789c59da7e148ab3be015284c5703f2670708dd8
-DIST lens-family-th-0.4.1.0.tar.gz 4562 BLAKE2B 1affa13291e8e610018761b4174bc45ac8cfcc23bbece8e82844a6660e997c5ab1916762bd65d2befa1aa5b0f19cdce1023111d2d7a6d765ff158aa726de6fdd SHA512 ab4283fcb833c68a838f006a71d30ed129c1d5f8ba030c4cbec6443ebeedc83e09a707a609c3c30c4420675bf5187227ce11f39218a3afb7ee563ad26104b774
-EBUILD lens-family-th-0.4.1.0.ebuild 605 BLAKE2B c5494ab0f435a4cf4e5e01849ef615767b0526da367cc2387f0cd97dc232bed2ffa0bc18257896c822d1cf89885964aea85f089fed1a034b797a3bd0b13fd064 SHA512 2c365d5969263f5a7653f0630a3468ec57c701d58bffc5c97269995247a7255a514c01a5c213339105fa5ecb3b5d77c35916c88d7e06266144773a6607bd47b6
+DIST lens-family-th-0.5.1.0.tar.gz 5724 BLAKE2B eec0a853e47fd4283a809c97d11d5b12fc5eda26d6d7fc136db230a518b8c99b9eeda40cbafad9ae5ba7916ef77d1d73b509324c407d96df6a8b5819f18703fa SHA512 0b38de8c6270478e7b8933def57288c8d938ba359f880b8e002f0871b56de4cac887b37d0a99c8ccc62ccc0e51416a7d4d3cea1d110477b7ade4ee0e9f799077
+EBUILD lens-family-th-0.5.1.0.ebuild 592 BLAKE2B 72daaa4ea37546553bff41d23b553a74ffee38bb3fc63d7be1da5668840ef57420a84e525be52f80fabf37239c26a230ee36252c1ff74b808a42afde2aeda94f SHA512 51428c1ead2d5cef15bbe4357be2edef1b14a53aba7992c4590578ca64b49a97c560fa41b08246e089afa8a6721d4ffd3b31e9bafce2307ba9f582f246cc22fd
 MISC metadata.xml 690 BLAKE2B d2cd7aa52cc8d336c744531618a66539841aa72e58678277937dafe5099c1a5ee827335cc65723df473c59ad72d71adbfd3873450f624eea158df7692a4be0f5 SHA512 55dc29a781ac230cf03c0d8f5907ddf60199804f9a37ceea31f361b3ce544b20a06c03b89615fe1076708ad76fe501c3dacf1907ba5f09ba345357ba68a80824
diff --git a/dev-haskell/lens-family-th/files/lens-family-th-0.4.1.0-ghc-8.patch b/dev-haskell/lens-family-th/files/lens-family-th-0.4.1.0-ghc-8.patch
deleted file mode 100644
index 06be29a8131b..000000000000
--- a/dev-haskell/lens-family-th/files/lens-family-th-0.4.1.0-ghc-8.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/Lens/Family/THCore.hs b/Lens/Family/THCore.hs
-index d4f2740..2f53db6 100644
---- a/Lens/Family/THCore.hs
-+++ b/Lens/Family/THCore.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE CPP #-}
- {-# LANGUAGE TemplateHaskell #-}
-@@ -52,4 +53,9 @@ extractLensTypeInfo datatype = do
-   return $ case i of
-+#if MIN_VERSION_template_haskell(2,11,0)
-+    TyConI (DataD    _ n ts _ _ _) -> (n, ts)
-+    TyConI (NewtypeD _ n ts _ _ _) -> (n, ts)
-+#else
-     TyConI (DataD    _ n ts _ _) -> (n, ts)
-     TyConI (NewtypeD _ n ts _ _) -> (n, ts)
-+#endif
-     _ -> error $ "Can't derive Lens for: "  ++ datatypeStr
-@@ -63,2 +69,8 @@ extractConstructorFields datatype = do
-   return $ case i of
-+#if MIN_VERSION_template_haskell(2,11,0)
-+    TyConI (DataD    _ _ _ _ [RecC _ fs] _) -> fs
-+    TyConI (NewtypeD _ _ _ _ (RecC _ fs) _) -> fs
-+    TyConI (DataD    _ _ _ _ [_]         _) ->
-+      error $ "Can't derive Lens without record selectors: " ++ datatypeStr
-+#else
-     TyConI (DataD    _ _ _ [RecC _ fs] _) -> fs
-@@ -67,2 +79,3 @@ extractConstructorFields datatype = do
-       error $ "Can't derive Lens without record selectors: " ++ datatypeStr
-+#endif
-     TyConI NewtypeD{} ->
-@@ -134,4 +147,9 @@ extractConstructorInfo datatype = do
-   return $ case i of
-+#if MIN_VERSION_template_haskell(2,11,0)
-+    TyConI (DataD    _ _ _ _ fs _) -> fs
-+    TyConI (NewtypeD _ _ _ _ f  _) -> [f]
-+#else
-     TyConI (DataD    _ _ _ fs _) -> fs
-     TyConI (NewtypeD _ _ _ f  _) -> [f]
-+#endif
-     _ -> error $ "Can't derive traversal for: " ++ datatypeStr
diff --git a/dev-haskell/lens-family-th/lens-family-th-0.4.1.0.ebuild b/dev-haskell/lens-family-th/lens-family-th-0.5.1.0.ebuild
index 784a93e87893..f8d4fb0e7583 100644
--- a/dev-haskell/lens-family-th/lens-family-th-0.4.1.0.ebuild
+++ b/dev-haskell/lens-family-th/lens-family-th-0.5.1.0.ebuild
@@ -1,11 +1,11 @@
-# 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.7.9999
+# ebuild generated by hackport 0.6.5.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Generate lens-family style lenses"
@@ -17,12 +17,9 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-8.0.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-haskell/hspec )
 "
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-8.patch
-}
diff --git a/dev-haskell/lens/Manifest b/dev-haskell/lens/Manifest
index 8a7a2cc87abf..19935dc28c78 100644
--- a/dev-haskell/lens/Manifest
+++ b/dev-haskell/lens/Manifest
@@ -1,3 +1,3 @@
 DIST lens-4.19.1.tar.gz 704985 BLAKE2B ddb9f660ff6a1930f356ce915f653f81dfa4814f4956e89d1df213dd57e2cab85eeea7be9efb46553c36448b01579319e8bf1d4c739cdc3bc13608d54f9e43f0 SHA512 50a596ce919abc93b453189453abdbf0f455e0531e5b83397d1e61308842222433fd7d4c6c6f5ec74f98d8dd26eefe861a0d88d5faf56a7b896a0b083b920a10
-EBUILD lens-4.19.1.ebuild 3812 BLAKE2B 5e66709f4a5fac199a05d4518e765f40fc50304e3c21342d92f2d96c5f66ba0b9095126bf8f492ef6eab803cb969cba884f8d1403a03967bb413294969f73ffc SHA512 4604209b82e270587c2c7ee593bef145e6ee51d45407b015a17e57e93dc07008672973ec6a9e4775f56a199fa72c34eeeb33cf7374c4541a5fde5a3fafe67c72
+EBUILD lens-4.19.1.ebuild 3737 BLAKE2B 0e5c91e9d89a6d9bf77f49c0ad1bf6b910dd2ab169abb1a6c177b05ce82a085998c7115255bcb23c2fcda2072c2464df558215298b471e4159d0863374fc4a16 SHA512 f02ddf918cacacd131258e6cc6d2941b2906af1fb1b5775693cd7ea71527a6e2fadab70889611aaadd075c85a307455d3fa332dc335631148e4e90a8e71b4b80
 MISC metadata.xml 4596 BLAKE2B a45f6f80d686ab0d2b57ca0a9ff7d89184c98101b15b8d49ca6919b4245b46898ed345211ef3a0af8229faf05e62c2bcaf406510223f2048d05425150bad8e8d SHA512 8893b9987ac5842ab81c4b283f15c88490322fc6c79df801a32f90eeb6b69472bd491ccf982fb7885db5edceae632c4d1e6a9e9ebdb15cb289907f51d52461fa
diff --git a/dev-haskell/lens/lens-4.19.1.ebuild b/dev-haskell/lens/lens-4.19.1.ebuild
index c4a5a24ea015..446a515c4d59 100644
--- a/dev-haskell/lens/lens-4.19.1.ebuild
+++ b/dev-haskell/lens/lens-4.19.1.ebuild
@@ -58,8 +58,7 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-th-0.2
 		test-doctests? ( >=dev-haskell/semigroups-0.9
 					>=dev-haskell/simple-reflect-0.3.1
-					|| ( ( >=dev-haskell/doctest-0.11.4 <dev-haskell/doctest-0.12 )
-					( >=dev-haskell/doctest-0.13 <dev-haskell/doctest-0.17 ) ) ) )
+					>=dev-haskell/doctest-0.13 <dev-haskell/doctest-0.17 ) )
 "
 
 src_configure() {
diff --git a/dev-haskell/libxml-sax/Manifest b/dev-haskell/libxml-sax/Manifest
index 742cf7cf22b5..7ae3c0828837 100644
--- a/dev-haskell/libxml-sax/Manifest
+++ b/dev-haskell/libxml-sax/Manifest
@@ -1,3 +1,3 @@
 DIST libxml-sax-0.7.5.tar.gz 8916 BLAKE2B d6d08951825a154e1d983097bb85f2007ed68d25a5fd2dfbe545f0db6f99d3fc8a7721599fee43a9b4f94327f8546d4ff3466be21ab1933bc5658e525d9586cc SHA512 8a7345610de1fa7fdbe0c251c5e3675f980731f3c4212e87243aec606457a152ef36d78c777428a8b879aa8662f75b6cd878fd5a9e48d283def24c853be43c28
-EBUILD libxml-sax-0.7.5.ebuild 710 BLAKE2B 2d11956693262355611f057f4537b17aa6fd38aca50cdf60d2ea034ad749b848581211b763352f37c0d7723a5a24a825442c385f010b5b3f36962c0f5482d300 SHA512 9e049a0309774b338b0adfe52c6111619ef7c2487076ebd7749a2220ea67a9dd1722e27f7ecb548e6f0a1e59c6ca18b95c24734047ce6246c9f26d044de96145
+EBUILD libxml-sax-0.7.5.ebuild 705 BLAKE2B f7c35915f6ad295522a89ef902d5090c7690801848480f467ec32eedb844719780d0ef37a15caecefb7dc3d4bf32a2946e76dd8800e56fba64447a4b051a0f9d SHA512 af288c649d9e1849af3992ce8e735776a113837ca14f789bd8834072cc64177a21e00cd2c53f4e80f6936f78045ed594ff4af1d5933a105ce0031a1bdfdad322
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild b/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild
index 4d4d88b66315..4ab2c3a7fcfa 100644
--- a/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild
+++ b/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild
@@ -1,9 +1,9 @@
 # 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.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -19,10 +19,10 @@ IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.7:=[profile?]
 	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 	dev-libs/libxml2
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
+	>=dev-haskell/cabal-1.6
 	virtual/pkgconfig
 "
diff --git a/dev-haskell/libxml/Manifest b/dev-haskell/libxml/Manifest
index 9b39337cdb2b..9d36853b4ad0 100644
--- a/dev-haskell/libxml/Manifest
+++ b/dev-haskell/libxml/Manifest
@@ -1,3 +1,3 @@
 DIST libxml-0.1.1.tar.gz 3959 BLAKE2B 938bf1b309696574e47b4128dba8824ed9b756416980fa367269730051ff319c68ea8e49b9f4e63ab2da358f9a2ed9adc2f5a1f12cf729fbdd3b3ea48beedd10 SHA512 59a52200e7c7ab17a60a89e4a3aefdf6356e868be6be53696e5708a4d30863ae879834404ccfecb91b6d4b93a7ce0e147a3cc04bc4d5838c2aa990a290af5c5c
-EBUILD libxml-0.1.1.ebuild 793 BLAKE2B 0437c5003276185b95b5df2cdde21e9f3c81521c41bf3650594d4ec2aa438b4e86a76e850edd7c71cd1d0c7bb18740bf4bad0638cae2d3fe75c9ebd8011e716a SHA512 f8de3d248da98977fe4764067adfb73f552529e3e1c7b163ff40f3b8587347ef3e83ef0def446f6ce97164c1679d57bd43753fd3060af567354663dcf68d8629
+EBUILD libxml-0.1.1.ebuild 802 BLAKE2B 231469fefac43322e81b1d23c9a2be77620fbcfcaab8fcaf0ad2697eb45f0aa684478b0717d2374dc2469c2f03a96f7a82995c3a434c27f99c965ac2954363b5 SHA512 5d05cb33c5aaa0d6e67bf2fbb4b043fcf049b15271a339a66a6e98dc526abdd38aa915537d332bc0b08360b3a637a6a66d885fec75b1863334d6a5a8d344933a
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/libxml/libxml-0.1.1.ebuild b/dev-haskell/libxml/libxml-0.1.1.ebuild
index 811bfb96c3d5..61c3adf00c84 100644
--- a/dev-haskell/libxml/libxml-0.1.1.ebuild
+++ b/dev-haskell/libxml/libxml-0.1.1.ebuild
@@ -1,7 +1,7 @@
 # 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.3.4.9999
 
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	default
 	sed -e 's@includes: libxml/xmlIO.h libxml/xmlmemory.h@pkgconfig-depends: libxml-2.0@' \
 		-i "${S}/${PN}.cabal" \
 		|| die "Could not patch libxml2 configuration in ${PN}.cabal"
diff --git a/dev-haskell/logging-facade/Manifest b/dev-haskell/logging-facade/Manifest
index a6946ad07ca1..7fd750407645 100644
--- a/dev-haskell/logging-facade/Manifest
+++ b/dev-haskell/logging-facade/Manifest
@@ -1,3 +1,3 @@
-DIST logging-facade-0.0.0.tar.gz 3644 BLAKE2B cd199aa66f8b124f56ede02f1872f56f8f0613c969b1619f556077c9693f059bc37b10404e423d0be98c3768e0038d8c3383563929a1713af1866424a65ed5a1 SHA512 d666aa763a7e94a914e7542f1420f1f96a1923bd97532db5e114140d33cee5374de78bc73491b008985d4470cec61fba05bf16a2eb68198f917480e0fe1a680e
-EBUILD logging-facade-0.0.0.ebuild 676 BLAKE2B dc9ef24fe32cc069afef89004cbaef1e08c96494e16e49529009968b850637b2c8a7ee7b69c73ce2eea260461bf792f90b069c478a393e4ee4be3309216e9d19 SHA512 f3e46729453cbf2f47419f95b38b40012a839ee9b1ecd2a334f0d07edbae85c9b7daefbae209e7b703028d12d899e608a19e090b5a3404c79868b8fef328e82c
+DIST logging-facade-0.3.0.tar.gz 4016 BLAKE2B 71be7c7616a533f8c97b9da88cf76fe1f8814172a43b190861a53dc0fcfc3a1adf673c7166c2834f20af304b9334f75e2bb0902b5a381c619d67de08bfc2f920 SHA512 3a6fbd7b309f6094224f6af2b98408a2a49519f8c0ca1a26178fc6c0b593af2101769a4981bcf250dab2ed99144ec14b19263a755e8c71a5b01400651076228f
+EBUILD logging-facade-0.3.0.ebuild 666 BLAKE2B 77be8188b49083a643c99e414d2b6ba14d325a2803e236201ca335ba997c1fc661cec4a5cc92acb84004e268b6c276411c85ad2deae2dea13a3a28ea01958a15 SHA512 3af70fb915987a6b2b93fb5516f37e6264c57f58a71e072229c64a26f07a03b093b477f5a5f8767058e24567f61c0b5e95aa8da39f7aceee0fe56dbc2b676adf
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/logging-facade/logging-facade-0.0.0.ebuild b/dev-haskell/logging-facade/logging-facade-0.3.0.ebuild
index 937fb57dee46..5e45df95d673 100644
--- a/dev-haskell/logging-facade/logging-facade-0.0.0.ebuild
+++ b/dev-haskell/logging-facade/logging-facade-0.3.0.ebuild
@@ -1,15 +1,15 @@
 # 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.1
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
-DESCRIPTION="Simple logging abstraction that allows multiple backends"
-HOMEPAGE="https://hackage.haskell.org/package/logging-facade"
+DESCRIPTION="Simple logging abstraction that allows multiple back-ends"
+HOMEPAGE="https://github.com/sol/logging-facade#readme"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -17,10 +17,10 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
+RDEPEND="dev-haskell/call-stack:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
+	>=dev-haskell/cabal-1.18.1.3
 	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
 "
diff --git a/dev-haskell/lvmlib/Manifest b/dev-haskell/lvmlib/Manifest
index 7edb7d1e2280..0e35466da02f 100644
--- a/dev-haskell/lvmlib/Manifest
+++ b/dev-haskell/lvmlib/Manifest
@@ -1,4 +1,6 @@
 AUX lvmlib-1.1-ghc-7.10.patch 2590 BLAKE2B 165938d0813dbf6806068ffa4e72c695d1a56eac4a7c2ba31a2dab12fca0549ff7210273eaa23039ad2f0d794727d541d0520609745e9bdcbcedcf8538c45931 SHA512 a645db9a37614752afa29d176133ee237511773e1d7c8d2f5959828264ad909360f441673b3e6bef5137bb0deb2f1eb108371032fafaa77a86d5a7be5fec2867
+AUX lvmlib-1.1-ghc-8.8.patch 547 BLAKE2B da9cb3500669435cef400e58c9f0bbbceb5d0e1a7a47d36c3437ef1b9b571884e9330a8d1043536ce196be4065517aac0dea9f1a4f4740c3e64077b6134d8619 SHA512 ce89864d5ff457774fe495fc4cde899b0e1903993288926f83dcc237da9fd72300d5989c0b5bcb76390fccb3d41364e969a8b6f3edf9079e9f4b7e448e31b35f
+AUX lvmlib-1.1-ghc84.patch 352 BLAKE2B 62c3937287a1c6af5696b879249e560bab9757c71ec2c6aff8d19a0b064c88fce319c02fa2d8decbc30fe217fef5e263ca583ca9261150bfb536d887d2effad3 SHA512 a639d7686f6e6c8d5798b31e656a4293c58c5f830b366f521a5b95ed5cfbb3962ade71d625cea16651f1eab81a8e6530c0ac910ed19df2abd107943642345ed3
 DIST lvmlib-1.1.tar.gz 62388 BLAKE2B 9effe8b0b71ef36b3f73e792a9702d44efa5a7ed9f48f35825d75706a7dad2d5f5cac06d5941f60730c79216af5f3009110919dfa397343287e7359e702c5fbc SHA512 3f085f3ff8e53ab19de3b425c4c5a271111afcd334ec08fefd983838608ae436005c20c2d7c545650f0dd1b76d466f81661a14c8ce972df27d79a78c22023861
-EBUILD lvmlib-1.1.ebuild 691 BLAKE2B e51b2dd6275da76f1ab962e22991a76c8355c4bdeb08c14f50095de5b9538c89622c7c8972e5ae5c9e393d59424c2771e50a16f06896e584a35bfc2b05c9be76 SHA512 f346cceed684f2e31cd822b5e770b10b96e9dad626fe752ac1990d41fa71da2a60288deae3492abaa252c2509479b305516fe8dedc228520f89952750fc8b685
+EBUILD lvmlib-1.1.ebuild 754 BLAKE2B 014580976485b6e43773a31d9669c8b6d8e62a0d1bb00ddaeec04d9670ae288afc38cfd652909755d1a2dfb9230087daafdd9e7ef1dc14f3ebfecba8fe16706b SHA512 b1853f8811e22c33b227b8c996f4691b2e207a64e20b13f9e2bdaa2f4527f1641aa3b13c042f60fe09365613e5212d4136339534b143b6b2403a5f5f132d1384
 MISC metadata.xml 822 BLAKE2B 6c75a01261fb049e7b175c7f4b8de7da8978bca198f5a55581630087682920da280185d6c1512a81a0e05bbe02b8728b8261564c4d7d6a15db67218baa47f5b6 SHA512 95c53741b0af7d02006f5715e9468b01d984c5145a4f0582f268da5c3ef19c7902d7a9fe48a8b07c1825dbe9a8e09cc03c208a405218ec930b72ddd9e9d31219
diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch
new file mode 100644
index 000000000000..36d680794f07
--- /dev/null
+++ b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch
@@ -0,0 +1,15 @@
+--- a/Lvm/Common/IdMap.hs
++++ b/Lvm/Common/IdMap.hs
+@@ -121,10 +121,10 @@ unionMaps :: [IdMap a] -> IdMap a
+ unionMaps = foldr unionMap emptyMap
+ 
+ foldMapWithId :: (Id -> a -> b -> b) -> b -> IdMap a -> b
+-foldMapWithId f z (IdMap m) = IntMap.foldWithKey (f . idFromInt) z m
++foldMapWithId f z (IdMap m) = IntMap.foldrWithKey (f . idFromInt) z m
+ 
+ foldMap :: (a -> b -> b) -> b -> IdMap a -> b
+-foldMap f z (IdMap m) = IntMap.fold f z m
++foldMap f z (IdMap m) = IntMap.foldr f z m
+ 
+ sizeMap :: IdMap a -> Int
+ sizeMap (IdMap m) = IntMap.size m
diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch
new file mode 100644
index 000000000000..8f9e85402f9c
--- /dev/null
+++ b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch
@@ -0,0 +1,14 @@
+--- a/Lvm/Common/Byte.hs
++++ b/Lvm/Common/Byte.hs
+@@ -19,2 +19,3 @@ import System.Exit
+ import System.IO
++import qualified Data.Semigroup as S
+ 
+@@ -68,2 +69,7 @@ max32 = 2^(32::Int) -1 -- Bastiaan (Todo: check)
+ 
++instance S.Semigroup Bytes where
++   (<>) bs  Nil = bs
++   (<>) Nil cs  = cs
++   (<>) bs  cs  = Cat bs cs
++
+ instance Monoid Bytes where
diff --git a/dev-haskell/lvmlib/lvmlib-1.1.ebuild b/dev-haskell/lvmlib/lvmlib-1.1.ebuild
index 9512fb153ec8..7184d226bf02 100644
--- a/dev-haskell/lvmlib/lvmlib-1.1.ebuild
+++ b/dev-haskell/lvmlib/lvmlib-1.1.ebuild
@@ -1,7 +1,7 @@
-# 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.4.9999
 
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10.1.0
 "
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1-ghc-7.10.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-ghc-7.10.patch
+	"${FILESDIR}"/${PN}-1.1-ghc84.patch
+	"${FILESDIR}"/${PN}-1.1-ghc-8.8.patch
+)
diff --git a/dev-haskell/magic/Manifest b/dev-haskell/magic/Manifest
index 73114d5356a1..51754a73a703 100644
--- a/dev-haskell/magic/Manifest
+++ b/dev-haskell/magic/Manifest
@@ -1,3 +1,3 @@
 DIST magic-1.1.tar.gz 4318 BLAKE2B 413c01af3bad4dd12cf4eda39d7de44a2126d2d250605b4d9054eb5b33f061d29dab0d2e244b662f451d7ddb907a6bb3e9c1a1dfa2d337af4464a2a0578391c7 SHA512 f400396b0f82f9655376ac72e721badcf60c356c8594b4b67922890f55bac8e15b7aa856fdf61942c40b2622bdc231914994968af3b98d353bf50aed09ebbef5
-EBUILD magic-1.1.ebuild 542 BLAKE2B 9ece022776f20a1989449e47224816b5e4da01594cd9a6822392d8b1c6a0e7b0020fec3c61a4334946ffe27cb53c361a24c3b84ae675743f3993476a2b929d49 SHA512 94953234c9202abf73f1493884f8cf16eb0281a31590799e876b9d90eaf51e204968b16ec865b9bbf7ef29942863b622553301dfc7a972e46a1bc06af0aeae77
-MISC metadata.xml 516 BLAKE2B 0893cca3417eb9cf310d0ce52c76a88f55329030fa7d8531b7b1a161fcb0b142d9f2b9668a35e7d14dc82b091c155c2252d02614089b5ad48a76b0d544848a61 SHA512 173b01975e2e7d408ce1f4dce30bba11b8bd538d57fe5d9fb98dae688de262d9fe56402890776864f4c2b0c7b29ca1a1ca553789660a70f6aa253ed2a2a79977
+EBUILD magic-1.1.ebuild 553 BLAKE2B 547f4fcf90bdcf652a94c1ea9f05246584b46c00c5a5dae1a05ee01918ddb045e26fda8261201f3d613c0ae40db64f3245a01af4b2a879d41915ebee3c40485c SHA512 58127e773ed0cf03fd55d9b452e4db9f002f428a6bb687aea33d99164f12263e548f2eff12c263d65d71ee55208493e67d696085e79897bbadd3bc2689deea45
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/magic/magic-1.1.ebuild b/dev-haskell/magic/magic-1.1.ebuild
index 24aa55d96711..6e247ba72615 100644
--- a/dev-haskell/magic/magic-1.1.ebuild
+++ b/dev-haskell/magic/magic-1.1.ebuild
@@ -1,9 +1,9 @@
 # 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.4
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -21,5 +21,5 @@ RDEPEND=">=dev-lang/ghc-7.4.1:=
 	sys-apps/file
 "
 DEPEND="${RDEPEND}
-	dev-haskell/cabal
+	>=dev-haskell/cabal-1.0
 "
diff --git a/dev-haskell/magic/metadata.xml b/dev-haskell/magic/metadata.xml
index 32e691a5478a..b7878815d80d 100644
--- a/dev-haskell/magic/metadata.xml
+++ b/dev-haskell/magic/metadata.xml
@@ -5,10 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides a Haskell interface to the C libmagic library.
-		With it, you can determine the type of a file by examining its contents
-		rather than its name.  The Haskell interface provides a full-featured
-		binding.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/markdown-unlit/Manifest b/dev-haskell/markdown-unlit/Manifest
index a41ccea73a36..ea195eeac444 100644
--- a/dev-haskell/markdown-unlit/Manifest
+++ b/dev-haskell/markdown-unlit/Manifest
@@ -1,3 +1,3 @@
-DIST markdown-unlit-0.2.0.1.tar.gz 2950 BLAKE2B 34d7dd34126c2a4e05b9c1b117e45dcc70fd3e4cd43640fdefdf036f865e39e927f11fa3f7b73a9b1b1c6b10cdaaf47aa9abe6f7ddac2ad99495479a39e1efeb SHA512 72098e14fd7c8abceb2001d0b180384b7e1e1ad180d41417841bef6c327a242cf1eec060e23137f46f766c4b15366c212f1dde9500647e504ebf6246f0e89072
-EBUILD markdown-unlit-0.2.0.1.ebuild 681 BLAKE2B 05bc8f4adcd9f772151a8abd03497fbff103b6e5ec9b1589b4a658d6df073d6a7e4f35a67e916b5b0ff31994a8782bab83e3e15a2f83f8f8d94a1dd33aefd4c2 SHA512 fded6c878461a7277aac0e478ee10f1b7d5c00806beb8fcf7e11da22f5857c47b657625da317f7269913da724826929277ff1836c20d356d37e2cfd3a630ee7d
+DIST markdown-unlit-0.5.0.tar.gz 4681 BLAKE2B cde0d867185c714e0c5d3c76e0baed4b1f7df4f0b85170e3d69476149caa5dd06f7de181e750eee357543ebc2d8e4178d711bee903bd41a5085c75057c9374c8 SHA512 580b4e4a4fcccf845c3e618b2ebc425dd8dba024c1c8bbae8db00a3e4b768353fe6738195dad80ae2afb1a46fcfad46cbed6d98bea1017ef098366fa7a2633ea
+EBUILD markdown-unlit-0.5.0.ebuild 743 BLAKE2B 5202c318c3c841a8f45cc0e7f9a7bb9ff1a759d496e2817633a1d78a93642a7ea0e742c29b4e071205258732c1279a1877a083a8492144683c682a0f6180bcd0 SHA512 5e1b2951f01e9916b8a21d2526699d43eea84ac026fcc0ea00b79ed3af69b4b5ef462aa822116a59a12aa6655925573a82fd0098c1c75abf411ceba51ce889b1
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/markdown-unlit/markdown-unlit-0.2.0.1.ebuild b/dev-haskell/markdown-unlit/markdown-unlit-0.2.0.1.ebuild
deleted file mode 100644
index d55f2fc6b1fb..000000000000
--- a/dev-haskell/markdown-unlit/markdown-unlit-0.2.0.1.ebuild
+++ /dev/null
@@ -1,27 +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.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Literate Haskell support for Markdown"
-HOMEPAGE="https://hackage.haskell.org/package/markdown-unlit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/quickcheck
-			dev-haskell/silently
-			dev-haskell/stringbuilder
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild b/dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild
new file mode 100644
index 000000000000..fbffd43af9e1
--- /dev/null
+++ b/dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild
@@ -0,0 +1,30 @@
+# 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Literate Haskell support for Markdown"
+HOMEPAGE="https://github.com/sol/markdown-unlit#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/base-compat:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		dev-haskell/quickcheck
+		dev-haskell/silently
+		dev-haskell/stringbuilder
+		dev-haskell/temporary )
+"
diff --git a/dev-haskell/mime-mail/Manifest b/dev-haskell/mime-mail/Manifest
index 1f1478a1a7ec..0c5614e623b0 100644
--- a/dev-haskell/mime-mail/Manifest
+++ b/dev-haskell/mime-mail/Manifest
@@ -1,3 +1,3 @@
-DIST mime-mail-0.4.11.tar.gz 8918 BLAKE2B 9d335f1953584961e377bdf041b7e93cf6a6e09d8ad3d86410bc565628a4aa75ad93a0bcdd484a566d88b36e1708ae32fdaa8a18424bf5135b5e44c16e9fa46e SHA512 576390c99ebfb390a4e3b2c441add80923033d91160aa834ee8b4491e117645d5ce2936fee798370feda8c21c477c95a1984314b28235a3cfcb5f72b2fc52a54
-EBUILD mime-mail-0.4.11.ebuild 787 BLAKE2B c82a5b901e757bcfa871a66ac90c45667a40680d624be2884ee98f46ea059fdeda91b226e461e2de36bd0d36a5addfe2a0aead1f8602279d70fd4e1c0b3986e2 SHA512 b30059ceb708a8524d8125873cfeadada88d064695ef17a8d0184bc71f6b16b58723d2055ce7034eecb8abdbd47eaa544379c2ed114fb98cfee4cbdc4f6c44ba
+DIST mime-mail-0.5.0.tar.gz 10504 BLAKE2B ba5e1908f64b5056927b5f2a9fa66c41e7d3b6a2b150e741c178cc655a715f604c9cef48285b6c6e186754587d02d6923715d89582fe48a4e0566fc0a0cdc7cc SHA512 b4f18be040d447436c8d180f596f565a0e9ae6f7f771512047b851b32e42dd1410522de755e0b3d5ee6c6db15c076dce0bd9312b43ca71f531c43249b4a6d020
+EBUILD mime-mail-0.5.0.ebuild 787 BLAKE2B 6cf3d8875b52ecc161d06e742518d4d1f40c4b918511febfe5fff4538d8a67cadcb0813fc0ccd2682c848f16106fda5f0873a3956013515e66dbc98fa2db25a1 SHA512 2b55ac1a0407153ff0f22652372b56273cb01c6dee2f691f86f9d2efe353555ae180345d6d72b72899699b22b92a8454fe6e394af388abfb5034be6edbb25c3c
 MISC metadata.xml 679 BLAKE2B 28d9585da38bec4e07e2f7b1a758b29d7316479d1e3b87d2b2cf9a56e71bcb3f07560746859f1e2caeda4ed53eaf4b11f9b3ebcb6c1ecc587a69f7d44edc71e6 SHA512 69cc2fb2efbafbca17649f2342f25204a74bb68270fd34decb797a97c7cdac3057de79cf84e0e7e5b85986fa3bbca3b80771acdabeed25a85308eb0aa162f071
diff --git a/dev-haskell/mime-mail/mime-mail-0.4.11.ebuild b/dev-haskell/mime-mail/mime-mail-0.5.0.ebuild
index c6ffe5c78c87..e4b58b61fd46 100644
--- a/dev-haskell/mime-mail/mime-mail-0.4.11.ebuild
+++ b/dev-haskell/mime-mail/mime-mail-0.5.0.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.6.9999
+# ebuild generated by hackport 0.6.1
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -21,9 +21,9 @@ RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
 	>=dev-haskell/blaze-builder-0.2.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
 	>=dev-haskell/random-1.0:=[profile?]
 	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-8.0.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-1.24.0.0
 	test? ( >=dev-haskell/hspec-1.3 )
 "
diff --git a/dev-haskell/mime/Manifest b/dev-haskell/mime/Manifest
index 280adaf30585..a9c57c0608c7 100644
--- a/dev-haskell/mime/Manifest
+++ b/dev-haskell/mime/Manifest
@@ -1,3 +1,3 @@
 DIST mime-0.4.0.2.tar.gz 9438 BLAKE2B 0aef0b6cb44aac122943654e05238616cd13d0b6431911e55df13634623922ed2bb8616ce09ca18d700ab4cd460f8dbde248b7cbb4f723609f4e50a02ade0af4 SHA512 03fad3792a6935ea5ea75cc9756760277ad005db106cf6aa4f951a23e32d170bcb09dea399d2ace5b4f44afc2c73ec1b377f86b8f70616320490cd690ae4ea15
-EBUILD mime-0.4.0.2.ebuild 556 BLAKE2B 85f24d1a4697ed688816545d15025d77457056b6f3348a18a0ff81e73c0cb6427ae96e54bd5ed7be482e7f649bd46c416dbd7d18c46d4ae132830a7b517c5527 SHA512 9b22b0b30051e343e46976699a52de5b8a5678d9fe1fecfb3967f0cda48fe4132bdf0f4c827a87f1eb434f38d5d5f0435a7b61b736d7bf54047ae434756e3bc8
-MISC metadata.xml 328 BLAKE2B a3498e44bdbc1b806cab82a1faecce6b515f26b21dd0afe3a1eed3571a613cb1a7ec5bc294d08d403095048d465a3d1ab90d2fc860de141df0c0ea30189db8cc SHA512 fcd944d1d7a3ac8c9c0193817a6ed8aadf7f6aa5d35db139f81e24f37401587ccd52a547224327c0d6073cc4d605950b3098545965fcacc92abcee37ea26d921
+EBUILD mime-0.4.0.2.ebuild 556 BLAKE2B 4a047755fc9a6f941194b90b8c45ee8963a914064a28c0ccb3f5abb0043b6c744b700b259994d78e86cbe15c37aa83c01c898b2082ff21a17be5b845198e5b0a SHA512 496fc3a897160be9039d779b8bc66e561447c76b73bc4cbfef7b5183febb044ecd350b964a3b0713c7339d4afd5ed502a32fc890f1bd43651edd6952d9c6bfd9
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/mime/metadata.xml b/dev-haskell/mime/metadata.xml
index 186d73000aa7..b7878815d80d 100644
--- a/dev-haskell/mime/metadata.xml
+++ b/dev-haskell/mime/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">GaloisInc/mime</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/mime/mime-0.4.0.2.ebuild b/dev-haskell/mime/mime-0.4.0.2.ebuild
index 5389dd18a73b..af28b2c997b5 100644
--- a/dev-haskell/mime/mime-0.4.0.2.ebuild
+++ b/dev-haskell/mime/mime-0.4.0.2.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.5.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/minisat/Manifest b/dev-haskell/minisat/Manifest
index afc8a0a6466d..1d9c096bb35a 100644
--- a/dev-haskell/minisat/Manifest
+++ b/dev-haskell/minisat/Manifest
@@ -1,3 +1,3 @@
 DIST minisat-0.1.2.tar.gz 45469 BLAKE2B 69a422874c40ec05f97af75ab63d263faafaa4623aa1fe9a40059d2285742ee11ee2fa14aca7ffb8b8503838f0612abea7e8c4b26826dd230abb422fe6c96731 SHA512 557f5f8412adb84784a1edab4981bf5029dea5b0ac731eca2e464f3573ba537c6696613bf494f08cfb7f1b53468f563f758138b60c00edaf046d7ce74f023a85
-EBUILD minisat-0.1.2.ebuild 600 BLAKE2B a80bbcb0bb540c64c74b716ccc7665a9af6f44bf6eff81f536ca0106d9ef67f9b1c0c1f2b20535862595c205b7a09d81ef875907a9f7bbab0921b3df88e1128f SHA512 bd910892fcd8cddca507b4e81c0676a688178b14b4a84e92c313b6bfff76110ce72d03652d28d674f4ebd32b53dc070d28426ea007544deca43406b840865036
+EBUILD minisat-0.1.2.ebuild 580 BLAKE2B 8d57bdfe5fef7676a44bc2cd7cd74a068e839196f1cf32ab6a895244653426d680b4b6b142b367cf8693872caf704c2c84db347aad91ee66de76514f70b44c4c SHA512 427926c0df03465ff14651cea2c1a13b9c5f9e98a5be2b96f28c9dfa39cba0640b916adfbc096d72a3686d70192614f77a218c59053bc01918f20f525ca84b07
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/minisat/minisat-0.1.2.ebuild b/dev-haskell/minisat/minisat-0.1.2.ebuild
index ab72ae827094..944b45fde360 100644
--- a/dev-haskell/minisat/minisat-0.1.2.ebuild
+++ b/dev-haskell/minisat/minisat-0.1.2.ebuild
@@ -1,9 +1,9 @@
 # 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.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -19,7 +19,6 @@ IUSE=""
 
 RDEPEND="dev-haskell/async:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
-	sys-devel/gcc[cxx]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6
diff --git a/dev-haskell/mmap/Manifest b/dev-haskell/mmap/Manifest
index cf92d29ff9dc..ece22c2c1003 100644
--- a/dev-haskell/mmap/Manifest
+++ b/dev-haskell/mmap/Manifest
@@ -1,3 +1,3 @@
 DIST mmap-0.5.9.tar.gz 11731 BLAKE2B 1a2133f487f9b214c8a4be3aa91a38ee849b40649b77eec8e656fbd99d32c31761d1daeb474a56e9e0611db631a22828ab20171c6522f324e278ace0de0dac2e SHA512 3b9ac1150050ac9d8e7870610923c8303b5fc74a4fdd796d7b6b411e2ba836111ae8520e16ad345aaf93b4dbcd27abd4c359a89b27d854db8dbd252b90a5298d
-EBUILD mmap-0.5.9.ebuild 1138 BLAKE2B 4f04aaf8241a83eb760a76340393b234f2a82feb2d5c02c5c92a168ceae9ec6836fba308e877721cc07d3d488ebab8e9437f3862f751b370e696450b05efce5f SHA512 fd0df211ddde7eae142c9ff2a90306357b284533360e691e1e39263857eb1fdcf5838f6a72e3442edca6d54d3291845ee211cfeeaecf9f622176f9c0058c4dfa
+EBUILD mmap-0.5.9.ebuild 1138 BLAKE2B 4d0c23b76a59863ecce8c3383b9cee73da989627d048b2b1f2a9f8a350fe5254d71f48b41585741185aa0af7eb77213ec6973703f81870240f9f577ce4469404 SHA512 99c39dcf1845bfee9c760e7a99618981ec72d040978ff03c2fe8f391a3efe64d807888aee7ec47d594d31ebcae40ec0f06bc2e023c9e78f1583449d680a4e9d4
 MISC metadata.xml 569 BLAKE2B 132fd4404bb9c963ca46ab92df1bd4bcff4bd33bb493f079154aaa44d9cce5b8accc3c44dca3605db23f2b92093ec4835dcd085a4f44d748280313e3df6c0409 SHA512 6e13722dae998496bbaafe7f1d9b93e041452d0adb0987ad52ab141923217f06e15430fe873041dfe247ba3d7bee6e4a0c2539e1f623dff4df75935fd8528c80
diff --git a/dev-haskell/mmap/mmap-0.5.9.ebuild b/dev-haskell/mmap/mmap-0.5.9.ebuild
index 969500d066f2..60050c7eae9a 100644
--- a/dev-haskell/mmap/mmap-0.5.9.ebuild
+++ b/dev-haskell/mmap/mmap-0.5.9.ebuild
@@ -1,7 +1,7 @@
 # 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.3.3.9999
 
diff --git a/dev-haskell/monad-control/Manifest b/dev-haskell/monad-control/Manifest
index 56ebb2257da9..c8c2d2ecbd47 100644
--- a/dev-haskell/monad-control/Manifest
+++ b/dev-haskell/monad-control/Manifest
@@ -1,5 +1,3 @@
-DIST monad-control-0.3.3.0.tar.gz 10518 BLAKE2B 8ef230a6cf1999c5549cf8a4889933a0f05cc07972ee6e40877435e42fcdfb7487942cf71775dfdf49b00e4461f1a26d52afedc840a8d2c1a3acc3e84b7fa96e SHA512 734ca14baea74f9bd6f3603dc84426bd6d79ae23998ffcce5c8b994dfa8d58b8a573e7b0f68f7eaab07163c8806d8d5f95160f0439cc5fbd07b9509c84e4ef8a
 DIST monad-control-1.0.2.3.tar.gz 13864 BLAKE2B c150338e8a585dc045fd23404719fe61a2367f7308e15344f81549fd7f0808ef8fa2238a35b0a7c7984d26885352186bd6bf43359dec68b2df93581b021dd794 SHA512 59837326ec9f25220cb6c7329c91a5806b0ec7412d6af24c0f0d52c4fd93b084e92edd4f5f61a4f9c4248034fa540c23b65d2aacdfca737ece98bb132b8f08d4
-EBUILD monad-control-0.3.3.0.ebuild 886 BLAKE2B f3a39a6f818deee8f02aea8d3c9fbab822b1788cefaab696846ae69cf16824f3e149b991de39d3fd86fb5cadcc66cbe563149502c39e2ade0eef7dc7966584ea SHA512 35c8a173ba6cbccfb0532d30c3027dae5b89fc7033b72badb4ed96d1149d78bd11bd74cebd4417fe3935e1885c491ee313ad0bfa12d7ae29b84adfa20aa596ef
 EBUILD monad-control-1.0.2.3.ebuild 865 BLAKE2B 5f01b415022e01840ae31d1aafc92320c48cbfddbba8a577bbf8f4cc09d094f13bb3ebbb8f6c42ceb41966aaf80c5543023fb3c4b57fcd5cbaf20423da1a8581 SHA512 c7c0fd25b36eaa0bbaa4a4ff759a48ee2190b54495b54e89061fc0256e532040966d3065db450d26eeccca9d478c015981671c99fa253115314a89b5187328a8
-MISC metadata.xml 1773 BLAKE2B c4bfe6f561321644ba050f51897b3034f5fa6220327de82658ebee603965eb420cfb47180f89a512762f91e208da004813032125cfe1478a8b510cef3cb97b60 SHA512 40ad4d1ec82c40f655a3962b48bc53de5e2429102d5cfa2daf435a38e81a17f2e2d1a97b46cb1102ffe9f6c3799c232ffb0f758f0cdbafbab639a3a696dce373
+MISC metadata.xml 1418 BLAKE2B 3cb5e29664cee060b863938636601a9e88e830b10b54c3344906db7408d70cc3135d59592c12d4a1a00ca09be3122df5224567bd5ef4a766666200cd65904681 SHA512 b5a79a8fb3c146295fcb3e8d97917519821f05e6318f37927efcbe7f4c1f6f65cdac074b7743ce948ceed644d075823aa3ab0dbbbff62ae4d49d34f434a0befe
diff --git a/dev-haskell/monad-control/metadata.xml b/dev-haskell/monad-control/metadata.xml
index 7edd4dbbacf6..e793f6b1fd4e 100644
--- a/dev-haskell/monad-control/metadata.xml
+++ b/dev-haskell/monad-control/metadata.xml
@@ -27,15 +27,6 @@
 
 		&lt;https://github.com/basvandijk/bench-monad-peel-control&gt;
 	</longdescription>
-	<use>
-		<flag name="instancest">
-			If enabled this package will export
-			MonadBaseControl instances for the lazy and strict ST monad. If disabled these
-			instances are only exported when base &gt;= 4.4. If enabled it is required that
-			the transformer-base package exports MonadBase instances for ST. It will do
-			this by default.
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">basvandijk/monad-control</remote-id>
 	</upstream>
diff --git a/dev-haskell/monad-control/monad-control-0.3.3.0.ebuild b/dev-haskell/monad-control/monad-control-0.3.3.0.ebuild
deleted file mode 100644
index 0eca556fefda..000000000000
--- a/dev-haskell/monad-control/monad-control-0.3.3.0.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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lift control operations, like exception catching, through monad transformers"
-HOMEPAGE="https://github.com/basvandijk/monad-control"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+instancest"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4.2:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag instancest instancest)
-}
diff --git a/dev-haskell/monad-loops/Manifest b/dev-haskell/monad-loops/Manifest
index 16458870c6a7..b39624e346f8 100644
--- a/dev-haskell/monad-loops/Manifest
+++ b/dev-haskell/monad-loops/Manifest
@@ -1,3 +1,3 @@
 DIST monad-loops-0.4.3.tar.gz 4996 BLAKE2B cbe025073cdf7ce193854de927ff34981709a206ee1061cd0dbf26b09a533fe5c3da961e9c5c77ec63bca9963eb4104399eb5d38eaef416df13138a4372dc562 SHA512 41a1314777661a411acf62dfa25cbb1a59fedd5d60d1a2b8566a3dd64dec361ab1fe35827320529a723a612e0443571ce38b17fa900eb8d5289bc52f653d47a5
-EBUILD monad-loops-0.4.3.ebuild 590 BLAKE2B cce1e3d9601c85c7035239c4e08d48f05b749eca6fdd6623a8ff69fe580d30d54d2392059ff7df896fd6b12602c3082d87fa11914d191350d4336380d9eae1e5 SHA512 c38154eef83405e06520ce1a23a4178c0da46857e8b6d5707cc5e0fbd4b330d91d543e1397ea04fb5969caf0ae38e232aa9f8e203c33af88316ebe67d5bc664a
-MISC metadata.xml 569 BLAKE2B 9a474ceee93931a469d0331c18c69c11d9ae4eba19a827c60c797c95521bcd8222909db352ba6ede8cc400c79375850a63f1afe4e60534a80e5f199c357bcb80 SHA512 57118fc45a4f8448e8943bc3b59b18c2b00e9f31297623a764ca88e715c6d6c273bdc953fa541747302fa4f2c24f96d62ae17f07b238df7e14a36d95f4cfbe4c
+EBUILD monad-loops-0.4.3.ebuild 590 BLAKE2B 4a9c4c80165165980c2ecdcf7a472cde5a876e8399a3d48065a107673759f04320f690dfc553e9859ee7cc75b042f9a55d93ea5ffab14baf92baf0899d1c2e0d SHA512 71b9d53e380dcbfa725d64229ac3f17d7648f251822514f520b5a571c022fda00115b52440381dd020a3ee1e1c79b2797d70ed6e750689e176b95679dd2f7d83
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/monad-loops/metadata.xml b/dev-haskell/monad-loops/metadata.xml
index c766ee1f8714..b7878815d80d 100644
--- a/dev-haskell/monad-loops/metadata.xml
+++ b/dev-haskell/monad-loops/metadata.xml
@@ -5,14 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Some useful control operators for looping.
-		
-		New in 0.3.2.0: various functions for traversing lists and
-		computing minima/maxima using arbitrary procedures to compare
-		or score the elements.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">mokus0/monad-loops</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild b/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild
index 20fd3dd4b280..e4dfae4f064e 100644
--- a/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild
+++ b/dev-haskell/monad-loops/monad-loops-0.4.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=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.5.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/monad-par-extras/Manifest b/dev-haskell/monad-par-extras/Manifest
index 71be6b30be78..bda383fc0c49 100644
--- a/dev-haskell/monad-par-extras/Manifest
+++ b/dev-haskell/monad-par-extras/Manifest
@@ -1,3 +1,3 @@
 DIST monad-par-extras-0.3.3.tar.gz 9146 BLAKE2B 44c0bcb007086fb478d287e3ae53a7aab0d30a7b1769e5b553634fb9bdc043917c80f6889fd79d37447afe5210ea54d226b8b5b9272c09a3134c007525ad9730 SHA512 89811cbdb6ab6654f31a8c327b4d0299c27938b226e0e12b0917393b610d02ea5a62182bff513cdfd19c21165658f0f1ef1ea00bdae114fd84d524051dca4fe0
-EBUILD monad-par-extras-0.3.3.ebuild 750 BLAKE2B a4eef5edde87b21f7a511f7a83927817385b70ac8dfd8645b4b62a0017ab696851b2c8512d8ca3d3c9012d121ee933993e0db9b8a44d22a05338b15da497db03 SHA512 6e30c82b4361cc550226552d76e83836e957e4a3054fe7799a2dbc2bc5e72545b45e2bac7b46084bea240dea6408da3e21ec6d8f681b2979d19ccf331829f3f9
+EBUILD monad-par-extras-0.3.3-r1.ebuild 748 BLAKE2B f0e8fce989650cd083b8f70a386451d336005127138742ace6d4ac5cab26ff918a325a09be78af7e4b22935f1218dc0c558ae7d8a95cc122fa6de116ac68997c SHA512 dae81a18bf2816efd245d0a3c91c1fe5f0aa478ea9334faf0e4a617f98c0c7cfdd0edfb0ba0e9319d3b7a76afc8f6c60a12f1a3b5f44dac3886a48cd74db28dd
 MISC metadata.xml 536 BLAKE2B 7f68693e099d7525470ef9afd38b483b2156733d8cb1aa6ad8164d0730a53b1a2d8566d9a70cbbadf584c9ff3a4fa6e23448476f123388b78f3dceeb7aae2ebc SHA512 b7e59189264ff5e0c04e14be9a48f9a8217b2fc8f466ffd57f29a772319dfe55cac17a1a487ea0dd1bf7778102c6ee9b59ff7c7ce445e1d42b161d8cb15993a1
diff --git a/dev-haskell/monad-par-extras/monad-par-extras-0.3.3.ebuild b/dev-haskell/monad-par-extras/monad-par-extras-0.3.3-r1.ebuild
index a8cf4eb3f96f..fe9fbbfa59c9 100644
--- a/dev-haskell/monad-par-extras/monad-par-extras-0.3.3.ebuild
+++ b/dev-haskell/monad-par-extras/monad-par-extras-0.3.3-r1.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.3.2.9999
+# ebuild generated by hackport 0.6.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,11 +17,12 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="=dev-haskell/abstract-par-0.3*:=[profile?]
-		>=dev-haskell/cereal-0.3:=[profile?]
-		>=dev-haskell/mtl-2.0:=[profile?]
-		>=dev-haskell/random-1.0:=[profile?]
-		>=dev-haskell/transformers-0.2:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-haskell/abstract-par-0.3:=[profile?] <dev-haskell/abstract-par-0.4:=[profile?]
+	>=dev-haskell/cereal-0.3:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/monadcatchio-transformers/Manifest b/dev-haskell/monadcatchio-transformers/Manifest
index 4dad0dc54aea..84d78b63d327 100644
--- a/dev-haskell/monadcatchio-transformers/Manifest
+++ b/dev-haskell/monadcatchio-transformers/Manifest
@@ -1,3 +1,3 @@
 DIST MonadCatchIO-transformers-0.3.1.3.tar.gz 4526 BLAKE2B d7fd79bf3cb2ace84c969d2566cdd0bb2641452b159c064d4a4bec87deadb1533fae8978bc32e97c661a753ac225caa26eaf37250398306cccd15a8619a081b1 SHA512 7794596851f59bcf3cc60e69bbad7c32f2f35fb4c9b1f53455e92d38503539b06dc50d4a9633ed3b6855bdfd0d69d41c37805c727025a81e9841d0819fea684c
-EBUILD monadcatchio-transformers-0.3.1.3-r1.ebuild 1022 BLAKE2B f75e02af361f3cb64682e096787ff0d389b0d0ac01b46f8686be58d0de9f9396d8ec3c1bc106ad51e16903658a98fff0c1477a876e7c7cdf080a11260e5de82a SHA512 c6d59e831492da33580e1f9d4471f5e0b725058395d17a7354b0696252c4da152178d1416048a30417b61af1eebe973a3b5dc230171ed765832265670dc56405
-MISC metadata.xml 628 BLAKE2B 878af8ce41fd1f11753d7cdb9921bbf800c2a302ff0afa1f0ed9e117a73bed84069655638807be6a7d0c95f7caa17370fa20612a46b4d439b329f8d4dfe6f313 SHA512 201dc853a626607dbb414178009282cb8a6fc2a925742a591d97c240fd12783351dc78cb6856892cc59e4ae388dfaa8a941c15fdca06be82c202277fde2c046d
+EBUILD monadcatchio-transformers-0.3.1.3-r1.ebuild 992 BLAKE2B 1b6115b1076fdc7ed49f2f3eef03ec303acbffb82f18d7c85bf3d8a7622cee0869dc60e3d19c59a29838c15c39da6c65aede8a0fbf110fd0eb67dc6814da2dfb SHA512 39a2411437e8ad95747a44571a17de291a253496fa45c5938dcc0bf2f6ae5eab6217f14ce4232600c0c05757096cad74de9a31b6ff63b121a34fd35d66e51f5e
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/monadcatchio-transformers/metadata.xml b/dev-haskell/monadcatchio-transformers/metadata.xml
index c5eb3035ebf1..b7878815d80d 100644
--- a/dev-haskell/monadcatchio-transformers/metadata.xml
+++ b/dev-haskell/monadcatchio-transformers/metadata.xml
@@ -5,11 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Provides functions to throw and catch exceptions. Unlike the functions from
-		@Control.Exception@, which work in @IO@, these work in any stack of monad
-		transformers (from the 'transformers' package) with @IO@ as the base monad.
-		You can extend this functionality to other monads, by creating an instance
-		of the @MonadCatchIO@ class.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild b/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild
index e4729f3c913a..321641777c99 100644
--- a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild
+++ b/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild
@@ -1,9 +1,9 @@
 # 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.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -22,16 +22,16 @@ IUSE=""
 
 RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
 	>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
+	>=dev-haskell/cabal-1.18.1.3
 "
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	default
 	cabal_chdeps \
 		'base < 4.9' 'base' \
 		'transformers >= 0.2 && < 0.5' 'transformers >= 0.2'
diff --git a/dev-haskell/mountpoints/Manifest b/dev-haskell/mountpoints/Manifest
index 4a31f4e574f6..490d00c18476 100644
--- a/dev-haskell/mountpoints/Manifest
+++ b/dev-haskell/mountpoints/Manifest
@@ -1,3 +1,3 @@
 DIST mountpoints-1.0.2.tar.gz 13505 BLAKE2B 137b4c66e6a4ab27e48eebe52607ce6ad71cca1c9abfe5ebd0ae130bbd857b8fddb22575f356f30ab58e171a549d0a726b4ab41287658d35860df300c7c8dcdd SHA512 763b58944ef4422641d4ce92d7a61c79fa95cdae9795e48db194ce10df622a3e079670099daa35f7bb51d4d10ee54ccc411105eb918bab2327d54571d9bd9060
-EBUILD mountpoints-1.0.2.ebuild 533 BLAKE2B 6ffdde33887a62b15e8ca535ab739d582fe0d3e8a10394f6b6727e5a9a232bb4c517509ce225a938fc21cb98e93b3bc3373ddeef6c6da616c8ed90a7a401b840 SHA512 53aafa4f54f94e8683b025945b54bfa706e1abbd40d923075e5c95849c40fe49f230c0cdd1da56aea7efe6bcbd2fd0be267425ea5f13f00a856ab5688952e141
+EBUILD mountpoints-1.0.2.ebuild 533 BLAKE2B 563c4d6cd978467e29a94f91e4539369ce6ec66b4691fdd1bdde6bbfca02c058c1b6967825aa95679df7cd9e2354104d79f7a2085050c6af8a7962d90aa15a42 SHA512 4b1dc2623b1d1ea0118743b3ecb9a3f7a5ddee21d55166ed5e24e7e4b51b398bb14063f21c4f8e14a6995c3f7690efff7d8466b3b38d696ee4bd88f8efba9f7d
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild b/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
index 2cdee7360f85..83dde002844a 100644
--- a/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
+++ b/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
@@ -1,9 +1,9 @@
 # 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.7.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/mtl/Manifest b/dev-haskell/mtl/Manifest
index 4ee4a5074d7b..067d154bf235 100644
--- a/dev-haskell/mtl/Manifest
+++ b/dev-haskell/mtl/Manifest
@@ -1,8 +1,3 @@
-DIST mtl-2.1.3.1.tar.gz 13955 BLAKE2B ded18304c2c5158cfaf02e77c01829895079d9a344692d8a4294ccafce66f867b709fb64b9b82fba728d659afb17ee54560fdb3b3894398677408eda7cf878dd SHA512 dbb388eda920ba23525f89f1be840f23e7afdf8a0efdbee9a2efd03eb0c9fd64e0788e186236bbdcc6203c9fc02a3512a63ad4dc82946f6e9364bdb1a94e5f62
-DIST mtl-2.2.1.tar.gz 15391 BLAKE2B a3ef2496a7b876cb1747a00aec092c21751c2774983f8db0fd78a8c4da220296c96dec3327c78c3e9eec9f43af25d7462518e3a03a69e80c1186777bcca43f08 SHA512 5c31626b15551ee1757ad701b8e5552202bb6fe1dbd002039e3b78c6d01108a5c50f565c4993d165a00eb564d9d72fb8d2aae891b6242f0ca8cb11f7b95c5c6b
 DIST mtl-2.2.2.tar.gz 16966 BLAKE2B 29755d32aa2b0107e512ab6fff1e2695076217d81d3d46276aa2610b7054c98c01b44611b50a0127f277b54d74e0d812e52b3ae2667bf1c2913e1276993fb5d4 SHA512 25aa48f53d9b1da04bb82d9eefff2e5f797a54bc0b22d6465fcef3bee8da0a459e714f4daf69669cc28a8fef5d638d8f9b1407dad2260d67d5a63e1cc324fe7c
-EBUILD mtl-2.1.3.1.ebuild 687 BLAKE2B aa8668f45f18b2278c2ea3334c741f55369a2a157c8e9c82be526f4b9ea99d9cd9b6426f4c6a12f4639f1aa35c897c96d1e54b5c640f344255e81acd5bfa1eb7 SHA512 2650c077b9f186b4265d0991ac9be233c6bf8a06fd663bbb1f15e675f52cbd77662d4b9717f8044eb7554ab82e8133a2f6eee3a556dc46f64b47fb5dd42d42cb
-EBUILD mtl-2.2.1-r1.ebuild 723 BLAKE2B 34d37d4eebf67b0d30355c9c8a43fa8bd689e8773ffb9fceabc21b0f82e9889731d8fc414cb9dc0144fe310e7ebc75423564f33a77313cc62f91b96554ac5af1 SHA512 14dcdd9bdef53ae17f1f470e3341a098bc77d353e2adcc1019e14e1e196e18a07e07b7c352e5f67364db62872cb5473eb9bde4820aa3c260b02397a0dcc07f6e
-EBUILD mtl-2.2.1.ebuild 682 BLAKE2B 7660f49a5a119c1dcdf6e12226f3cc26bdd5a27cf10278bffc5e213f7e4000eb715f19a176b656088a0fc7d5774a27e12bab81411e6a35523d15d2e76dd48ff6 SHA512 f9ae0ddc4b6574425e673853d91d5f74ad50060d09e5c77047e6b3d25dbbd10dd983c216937b07de2a3c7d22d2b80992d8dab3be6fb15e63e14abdf4a247df09
 EBUILD mtl-2.2.2.ebuild 893 BLAKE2B e0cf628f12a919a03c55423e25af918e2a43b690337b483a9bfb0d3a5d87c8172e3aee4012c45137d37466db5908f86ba0b3297f8ae9badf86f76d8eced35e18 SHA512 137f9c759a6f04d934a1ab62309eb6ff6b59c8b623c50641fcdd780eca0a7408b4b4c2fb6cb8f8873d0e5ac259c498f0cc796ceaa37a665f32f441199331e024
 MISC metadata.xml 693 BLAKE2B da27e97919715cacee75756746262ee8706cd83f26967cf33bba060e85034cbc546a0c52093ba34dc9db7faa81db2fe0162adf4882cfb6fd7d86137915721ff9 SHA512 3f98568414ef1de6679c4d8a1f381bba6eff560b889830d711578252feb9dae978a60fdfd7e84f5ba71d09a2710a21cd464e1735b5bd139462d12694df8be781
diff --git a/dev-haskell/mtl/mtl-2.1.3.1.ebuild b/dev-haskell/mtl/mtl-2.1.3.1.ebuild
deleted file mode 100644
index d8e5251d6c26..000000000000
--- a/dev-haskell/mtl/mtl-2.1.3.1.ebuild
+++ /dev/null
@@ -1,25 +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="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using functional dependencies"
-HOMEPAGE="https://github.com/ekmett/mtl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/mtl/mtl-2.2.1-r1.ebuild b/dev-haskell/mtl/mtl-2.2.1-r1.ebuild
deleted file mode 100644
index db020fa38a31..000000000000
--- a/dev-haskell/mtl/mtl-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,30 +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"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using functional dependencies"
-HOMEPAGE="https://github.com/ekmett/mtl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'transformers == 0.4.*' 'transformers >= 0.4'
-}
diff --git a/dev-haskell/mtl/mtl-2.2.1.ebuild b/dev-haskell/mtl/mtl-2.2.1.ebuild
deleted file mode 100644
index cbebad8cfef7..000000000000
--- a/dev-haskell/mtl/mtl-2.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using functional dependencies"
-HOMEPAGE="https://github.com/ekmett/mtl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.4:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/mwc-random/Manifest b/dev-haskell/mwc-random/Manifest
index f26e85e9de3e..55efe589b351 100644
--- a/dev-haskell/mwc-random/Manifest
+++ b/dev-haskell/mwc-random/Manifest
@@ -1,3 +1,3 @@
-DIST mwc-random-0.13.4.0.tar.gz 22927 BLAKE2B 1c7bf3470a389f0c77fdebe7e1a90f750fc7458d1c574b3a45933eddd87961433b0f4b21e784a2e5bf85a73893f96fb730e86d1c0a7c3d0c3400bf72be153c0c SHA512 1f1e005998fa8310710629d69258465b214bc2b369ab95cb307689209f1812b17301fba28d33c45f8ae0ba63381ea6775ad9037a9b52464d7df35c36b77594cf
-EBUILD mwc-random-0.13.4.0.ebuild 905 BLAKE2B 3f1b750f8324098ca794b69bc0ffbb79f5bb233a4ea4f5860111400b01ef1718f320125192202dff8bd0c029497c990a6c7f1f619377ae444f54be0b72a83808 SHA512 afb081bf65463d567dfe3d4b01b2ba141baeed802439234138081f9124a9efb7ef7ecd5311c3fef5dcb7c0505ca756bc64bebc038487b86e72ad5680b52e2a4d
+DIST mwc-random-0.14.0.0.tar.gz 19674 BLAKE2B 3410f8d237c8e4a0f079c13567082273fc79d287c8de2b9ea0c1f396271ba7571caf890d6065ae7f0e5aae41f66575d90df178b981db24c9792213facf1d9c3d SHA512 bb262d6f4a37d91e4c0667ec5140894ed36bf3ef4b90e487f4d689a6bc4eddd09dcdc3c8b75013124908ca1642e990c3e074fb728acc1b36f63b3db66528301d
+EBUILD mwc-random-0.14.0.0.ebuild 675 BLAKE2B de50fa6157fb11d581bda879c94350c11263b9003005c0988b51acfeac3d3158c5da4fb0afe47ec792cef489082df10ce3794f60c591c6b85c9ee0a6dc6bbb8f SHA512 2ea26d8483093dde0ca175809381f91341ace5f53cd0523845efd5ec97d4b4c49036ebf1c2e2158d5baecc0ff48eeb64a688866ca8782366475f0aeb366cf0cc
 MISC metadata.xml 974 BLAKE2B 496a32207f648cd028d776ac0884fbcf3223477b606d2e6891a8fd4363add0ff4886210e06303b8bfaa02695f367064bb12de6ff304101d6bcd93826ed74637e SHA512 48483d69d8c91937c75cc4bb9b618dcb036dfbdaaa78d439b665c98cb42e417317fd289afbcb071ff2cb36efab88b93561abb757ca7de35ad92f87a0d6599e1b
diff --git a/dev-haskell/mwc-random/mwc-random-0.13.4.0.ebuild b/dev-haskell/mwc-random/mwc-random-0.13.4.0.ebuild
deleted file mode 100644
index 7c470db83dda..000000000000
--- a/dev-haskell/mwc-random/mwc-random-0.13.4.0.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.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, high quality pseudo random number generation"
-HOMEPAGE="https://github.com/bos/mwc-random"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # circylar depend: mwc-random[test]->statistics->mwc-random
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.4
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		>=dev-haskell/statistics-0.10.1.0
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/mwc-random/mwc-random-0.14.0.0.ebuild b/dev-haskell/mwc-random/mwc-random-0.14.0.0.ebuild
new file mode 100644
index 000000000000..d9bb642a9cd4
--- /dev/null
+++ b/dev-haskell/mwc-random/mwc-random-0.14.0.0.ebuild
@@ -0,0 +1,27 @@
+# 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="Fast, high quality pseudo random number generation"
+HOMEPAGE="https://github.com/bos/mwc-random"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/math-functions-0.2.1.0:=[profile?]
+	>=dev-haskell/primitive-0.6:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8.0.4
+"
diff --git a/dev-haskell/nats/Manifest b/dev-haskell/nats/Manifest
index 53afe8f10067..12129ee94bdb 100644
--- a/dev-haskell/nats/Manifest
+++ b/dev-haskell/nats/Manifest
@@ -1,9 +1,3 @@
-DIST nats-0.1.2.tar.gz 3954 BLAKE2B f20f839d3aa4ac0a06f873d87ac5a691a7eeb62489904875918dd395302cee021cd59bbb0cafb88fd8554c99e14ba7dc9dff5a3704a394b5d342133560347fd3 SHA512 11903b123d0ed27af9fccc8bb7c343dcf42ac8d58768e628460153b0bf6f27bf1f1271890b26a48eb234b3b89bb7b9e48266a4b39742f56bcf8913e0c3751ab1
-DIST nats-0.2.tar.gz 4740 BLAKE2B 9300e1834feec441d35246377314c7c302c16c76548498352c08f07262bb491dd68ea9303cc22e67416c349e224153c484977d14491eabcb6ce22a2991f7c0cb SHA512 419f2b4f938b7d590f45a25be163e25f29d47ec0fe7cf5d1f69cb9624c5617dfc25a0b14daf1b31ac590c021120eb5cd93bdf902d27136e3019e30ce2b5d3188
 DIST nats-1.1.2.tar.gz 7776 BLAKE2B ae2012e1e8a433c3802b7470f95a7e4b391f9c7ee50f41b94d2ee9d20b630820e550efa76fb5d64926942e87e761db0702ae4310573d0bca38f52fa419a93390 SHA512 596f11e98fe57893279ddd1f5af11a12e747e0d5e87000c7e20d0f5c2da0f0be9a6b8d19c8d5759716a7fb9a3e77d0e999380af3d5a350fe32a5492dc6077450
-DIST nats-1.tar.gz 5768 BLAKE2B 1c8e08ce3cefade9103d4d16202d68eb1efae526ec1a4595768b121b15ee55ae5e071cfe6a1923219422a33278d53b290ec0aeee47c4eb8a7c6aed319dec0628 SHA512 a53b8890d3b9f9f799d0af25626d23a570b7d3f227968d4a1033385d87e4502120e26f8623a3c5c0c21dc0db98a000ff79565cbab0298fd9c17a917ea8e11edf
-EBUILD nats-0.1.2.ebuild 543 BLAKE2B 1f569c2d079ebf66bf12f83a94c7c49dc48b3f55bcbce981f4da8949e41f7c07a054ec85a4ec87716888adbf2697d921d70ee2ce84c2e0cb5f43a74b9d6994f2 SHA512 bc7896c15609b96520e7a1051c0074391326ad2d9625679b3525d2ad3475d5e072ba44d5b62dc8ddcf8caa87d18d74f1a8ae12a1accc112804cdf1c9fb1e68a2
-EBUILD nats-0.2.ebuild 717 BLAKE2B 4c9cea91e739cb2b8541a84ee651ad07620c26315d6f7126093b9ec43266c8a45973ee97ba92597ca204c1b65bdc02c46d19a857eda9e9a69922edeb797e3d80 SHA512 473d3ed753b9ae472ecd71d609fe3b3efe8b075b840659c1954945f437137cbeffce4d47565cfbbbe1f44bbaf498c6c0f2a0de431d81b5fd1c5f257986f1267c
 EBUILD nats-1.1.2.ebuild 1052 BLAKE2B f9e93ddc09b9693f23dc8c544be6d59c65ad1192ce2f04db5e9344b70bb500dbe7e0e5ff1a9872a086020a328a8d16f702d2025b8e65ae7802c5c59ab3d17129 SHA512 f85baf0fae68121af3396c33fcbcbcb5513bd88bd34fd51a893a3104f506b96a1f1d23755962a9ea8164de532ef923126ee96575f7b9fc7ca01082568e6101a6
-EBUILD nats-1.ebuild 725 BLAKE2B 4ac86b59bfe91b8d761f207f55ecd83d8f53fd51c769c3ada619d4a4d67a6174e985da1bcc9024a7f9419ad2aad967839aae1e693568d85c77fc0694bb78ac8e SHA512 65f7b5c9854f712fabaca4dc0fb79a09892af952f5c37ba5706f0a1ab4131e586ba982fbd1e6963e75227561a188c335350f2c6a84a3fb8a170460488cd38796
 MISC metadata.xml 437 BLAKE2B 177281af1624f8116c850f951bac009e934da5629d45cee3209b86d168579b866d328cd6a9d49da4e4074dafedb92abf1d32fd986bca15e646b98d72506d398a SHA512 1b9370020df10c1e6940e14f51faf7e82c4c40bcbd7cc5001478b03007ceff64b6133f8d278aa9fd6380260c32b5ffa89dd343bbdca1aa21dcd5e6dc01ca898d
diff --git a/dev-haskell/nats/nats-0.1.2.ebuild b/dev-haskell/nats/nats-0.1.2.ebuild
deleted file mode 100644
index 5fc2a8ac92a3..000000000000
--- a/dev-haskell/nats/nats-0.1.2.ebuild
+++ /dev/null
@@ -1,24 +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="Haskell 98 natural numbers"
-HOMEPAGE="https://github.com/ekmett/nats/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:= <dev-lang/ghc-7.10:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/nats/nats-0.2.ebuild b/dev-haskell/nats/nats-0.2.ebuild
deleted file mode 100644
index 1792cb4b0572..000000000000
--- a/dev-haskell/nats/nats-0.2.ebuild
+++ /dev/null
@@ -1,30 +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
-
-DESCRIPTION="Natural numbers"
-HOMEPAGE="https://github.com/ekmett/nats/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+hashable"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:= <dev-lang/ghc-7.10:=
-	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag hashable hashable)
-}
diff --git a/dev-haskell/nats/nats-1.ebuild b/dev-haskell/nats/nats-1.ebuild
deleted file mode 100644
index 8aee789a0a54..000000000000
--- a/dev-haskell/nats/nats-1.ebuild
+++ /dev/null
@@ -1,30 +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="lib profile" # on ghc-7.10 does nothing
-inherit haskell-cabal
-
-DESCRIPTION="Natural numbers"
-HOMEPAGE="https://github.com/ekmett/nats/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+hashable"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag hashable hashable)
-}
diff --git a/dev-haskell/network-conduit/Manifest b/dev-haskell/network-conduit/Manifest
index 7092d7cafeb4..3728f0c14af2 100644
--- a/dev-haskell/network-conduit/Manifest
+++ b/dev-haskell/network-conduit/Manifest
@@ -1,3 +1,3 @@
 DIST network-conduit-1.1.0.tar.gz 1357 BLAKE2B 7952df2ab1a141a6d9b5460bc128ea1b45df0ea178a1d75e8e746d66d5d11c9cee278e56bb99dc4aed62af94312b1c3e6eb9f89be4ba94c198d96091b90100a5 SHA512 1bda46190bc9759e9d85f61f4555dca4444c307305b8a7ebfc3e88519ae8119e313eaf4095541c487b8431ad342320d83ff4dd1ebf271cf10c11414c652b34d1
-EBUILD network-conduit-1.1.0.ebuild 600 BLAKE2B 7edd8e7814e9e7fc3418f50ddc5beb7da1a38ab8a86c2aaf0db642c2269595c1274bbb2ee796d667ae978fc90617610379de5f61e37718ca49b4966998d59cfd SHA512 e613bf25ec0a74d84b3e3f397d2fe7afddc5bbefc0dee48cbc915920fc31632d8f8f29aa305c183040c6252092e4a4148b2b68a7eca66c7d89b728ee98b32800
-MISC metadata.xml 330 BLAKE2B d56163baf6c38494b371fd7f1fcd301119899051db4735a607f802ec25550dcdac277005a9785b323311bd0e4282630ea8de2abff756b5fc1067ef4d07d6de51 SHA512 48095eabcee345441e214e87e05b66a2323a48ccf2f596601105375f3f36d30dfe5c193e717858ff4f4719e49bdb9e5c3bf85c52cd87cb039e35c2208db3417e
+EBUILD network-conduit-1.1.0.ebuild 704 BLAKE2B d9d7f8c5aaa890b2f90369f16fae91014ffd0bcb9c6300e7839e830d94dd1ffa3d2e91e9c690c86072c3d58090aded6d4925741f47e99a29a5e30bee800375d3 SHA512 157f913861f89705fc12fbab81c72471e0ca48a8b646792e3ab14d1cb967d328835ab3b9315bb8dac47159424c003f8b827dceb61aa1ecb8f668b0f68a5190f1
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/network-conduit/metadata.xml b/dev-haskell/network-conduit/metadata.xml
index b22e8f68da82..b7878815d80d 100644
--- a/dev-haskell/network-conduit/metadata.xml
+++ b/dev-haskell/network-conduit/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">snoyberg/conduit</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild b/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild
index 3fdab3fde1fd..688fb8141181 100644
--- a/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild
+++ b/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild
@@ -1,12 +1,12 @@
-# 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.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: -network-bytestring
 
-CABAL_FEATURES="lib profile"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Stream socket data using conduits. (deprecated)"
@@ -19,8 +19,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
 "
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-network-bytestring
+}
diff --git a/dev-haskell/network-uri/Manifest b/dev-haskell/network-uri/Manifest
index fd8e2548bc56..9dc2e08e05d6 100644
--- a/dev-haskell/network-uri/Manifest
+++ b/dev-haskell/network-uri/Manifest
@@ -1,9 +1,5 @@
 DIST network-uri-2.5.0.0.tar.gz 1665 BLAKE2B 7f4c1090cf22f83b69b2cc222001f607f6bc0ff9a98a9d20438da8cdea751cded6ffd2b39f05561724cb87f194a15028240bb44c06d24d539dc6c42ac4b25f86 SHA512 9bc738e6de09a3dfd1b929c6f9c557abedef239034e886ca65d15a1ffc423dc72ce8b09f0f374ebd701b237600b65d031d5bc75f5ea937291328f4a1d01e6061
-DIST network-uri-2.6.0.3.tar.gz 26639 BLAKE2B 6d94ac9c89bf0758deabc6869d0964050a610620466054f704608212033e410edd23497c8cfb4d746b891d6f0e7b30c76581f2ba1cf57082d0ce59714ce1c5c6 SHA512 69d52462ed5af44fc3c1e27b741d87a33e0e90fe1fb314f68fd7b8819007a0e88dbde5f53ae7672d820ee48ac99cb9e422dc7274b7032c965f867089468d73ba
-DIST network-uri-2.6.1.0.tar.gz 27262 BLAKE2B 9ef806e6a97a62b43d15887f7e8bad20568db5cbfcbea320d749b9f4b98ebc8eb729762982baf627df792d0535665f4a52a76afdba40e3a73c475bcf86b17238 SHA512 c1b6e516cd19875aab0da325dcb8f5c6b98d43c3952bda4f96bd9c798882357c724b2facbef09e2e98d29b696a9e5518a2de9463fb0af4c5df0734fe2654cc24
 DIST network-uri-2.6.3.0.tar.gz 31997 BLAKE2B 305a32a14eb32bb723ade1b20665e1f37a14111a7725bfcba99bd59120e5ac08c0f30c7fa32692a64f5a0bd4b26292e93bb079b89aa043c3fa0188316d0908f8 SHA512 15091367e4543de1e2af0d81973b8e456e2c5f5295dcd7a91b91f46c2e07a6a655c6ab4c0837ce7566b21b43bca3569c1b27bb7f437572b09d00e678c7b512f0
-EBUILD network-uri-2.5.0.0.ebuild 541 BLAKE2B 65b6a69084d674d2addad4ddc1bdb77d191e88baafb313b573f41179a4d4d01bc0b65cbd6f4359d305d7ba253b363040f924e880665ee05fb15ece6815c79412 SHA512 bfe46e47a017b702cdfd7979c471c426baaa4b5cea982145e6f383c37ccff0ed83d30a81f97d3f063160d7469f288a67abece4c8394a55f65721ac152b2a711f
-EBUILD network-uri-2.6.0.3.ebuild 811 BLAKE2B 0bc7ff5a8e873d08e9ab135119cf3e4a8e8b970429eed7d0d1a7856ec163eb23e9c01977cefa6aefacc2af7654bd293a3107b271eb712a53f219339087ff7a05 SHA512 b36b0df202c2d1bc723e958db174c14336c4eed57abe77e375f9d5f9a60a741eff79d66463b1893cf7d5d96f5a326fb5fef0b35867ab9f30a7f612ea88c38248
-EBUILD network-uri-2.6.1.0.ebuild 811 BLAKE2B f6030e54b5c0c0df8123ee8b40904b4cc5c47abbde4f9259f4fd7b460100c6668b1a0fc1bd3e2673d46023e843c32e67a72b42a354dc92e60680ab516f27f8ae SHA512 f5318082b5af9ff69b45d314b4eba6cebb89a29eba4a51ed4c3261906c72a3b9f98dda69524ce0b3e827008baa55d06152243622bde9f9681600b44ccd4f18a9
+EBUILD network-uri-2.5.0.0.ebuild 541 BLAKE2B 1ca7efb5d66c32a3426ed0278615fb2ba02bb090561be100975ef44812db83f12983886b385aa73f5e6f474c959d080d40d4822fac8c41018f2794901fa5946f SHA512 ed1bdd84ced8fa867de893a9d244aa631f463e2557b331a5bdbd18cd31d779e1de613ff7317a3856fcb8d4d3bdc53fd7d9d5b217e3078ecb761fdd93890a9099
 EBUILD network-uri-2.6.3.0.ebuild 744 BLAKE2B dfdd04ea6c8ede85e6e614417b0f083b90b9fd9adf14bba10438544f82bba2da275d84fafe50e4e8718399752e2eefe2f2e9959767673b44bdd105ce604a8c1a SHA512 17b3dfdf28d05b09abba010b97eec6c40e5b34accdbc99c6626a2ecd0e39c2beb94df6dc291e8163735cdce1be6313da8a3d9c181f73286ae6569f47ee14e5f9
 MISC metadata.xml 1145 BLAKE2B 08c579460c155f26b818729fd01266a1a9ef569c32a60a0820baf19005d1f8be213b7f3340f724b54cd4671c116557645ecac359c8a221cf14fe9f83c408c408 SHA512 5f7bbc0bdb35e22641ca82c19b948a3dda898d3f697babdf450b94ae9a90cf299fe3c3356d3d9649bd59a4de065423ab542666dd00cbc619d4071573c627d148
diff --git a/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild b/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
index 17840d2a8699..4f45f27b1eec 100644
--- a/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
+++ b/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
@@ -1,7 +1,7 @@
 # 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
 
diff --git a/dev-haskell/network-uri/network-uri-2.6.0.3.ebuild b/dev-haskell/network-uri/network-uri-2.6.0.3.ebuild
deleted file mode 100644
index fd3d201904ab..000000000000
--- a/dev-haskell/network-uri/network-uri-2.6.0.3.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.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="URI manipulation"
-HOMEPAGE="https://github.com/haskell/network-uri"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	!<dev-haskell/network-2.6
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/network-uri/network-uri-2.6.1.0.ebuild b/dev-haskell/network-uri/network-uri-2.6.1.0.ebuild
deleted file mode 100644
index bbb6682ef743..000000000000
--- a/dev-haskell/network-uri/network-uri-2.6.1.0.ebuild
+++ /dev/null
@@ -1,30 +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="URI manipulation"
-HOMEPAGE="https://github.com/haskell/network-uri"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	!<dev-haskell/network-2.6
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/network/Manifest b/dev-haskell/network/Manifest
index 9622cfd568cd..37288cd72420 100644
--- a/dev-haskell/network/Manifest
+++ b/dev-haskell/network/Manifest
@@ -5,10 +5,10 @@ DIST network-2.5.0.0.tar.gz 141768 BLAKE2B a7da62a236f87d4afb48e1289b536d924b041
 DIST network-2.6.2.1.tar.gz 118092 BLAKE2B 38f5be09b44ef90e4ecec2d73809abc8bcd15f55b95f6e390d925634e9e56776e00fd0bb5d223d26c85bd31d318ec61553918eeaf8b9c15258aaa70a41e6494d SHA512 debf0a05e1b9d048b7212ff21b92895da84c864bf71c3c5adee5070402c94a38f6722fbc11cfb15df36fe9bfe092bb0c29a0f3f9475a319f38e0c0659989cb68
 DIST network-2.6.3.1.tar.gz 120418 BLAKE2B 5e48e61e3f8b3ac9d9fa5bfca37929581291941d1f55f332614bf61552354a31e1f565092e4f83e67181384553b5efe2040d12882f85fe03d2377b93233e883a SHA512 3c23ef0a1bf5383cc2479a517875037f9de38c79c1293734cc723111ab880a5842e091ee91a612090d0a2e422d53028d17cf5b0800af0d1d6c983d564197b9a6
 DIST network-3.0.1.1.tar.gz 114777 BLAKE2B 05ced39ff17eb68e5e70ddb1036770413224839d5a2c84ee568823feb364f1da898bdc56ae7e64f0e24db80dbc2ec739e42763708b3373f49a85ecf911c72621 SHA512 faca3b25c8724a0c832b6e12e21381fa9642a60bce8a01ea7b570216cd429b2332b14903011f4a554af227de5e502f9619860c230a8f2a69cb5e2289b1947e3d
-EBUILD network-2.4.1.2.ebuild 764 BLAKE2B b2ebce1baab93fb2627d7b36dbf29e22c167774ed6843ce742a3fd20aa8521c9009c26fa831daa95cd02e8b5f7b2722b2eb41270a62740b4eca9ebd5c3f80e74 SHA512 f4aff5dc267546d441e470ec8bfb4149ecc4db451282ca09d434670209b556b125f86ad020d66f710cefbf0176a32f474b047963e65bfcb921aeef76d33566ca
-EBUILD network-2.4.2.2.ebuild 758 BLAKE2B 17e24180297edbe9edad8e81b1442bbab5915a6983180e2bb0169780d13a0ff76c4fce0266b9e88915d79a8f03b288fb6652b5ff7278e433c3dfaef330463dd0 SHA512 cfc70685548bccf1da586fa65e06dc7eb21e0fd46a0bae8074fd99fe241b66e8448042d44d3c7d8a28f14aa9c59bb485c01f383b6c255056b95222b66f2fb7ef
-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-2.4.1.2.ebuild 764 BLAKE2B 388f16f502d944e917fbe64b37b8253504833f8190f7f2f3cd526172f50b921c5ce114fd09c2ceb84f145a4b012ccc341d4d128bc0826fdb470651f806b18ea2 SHA512 41cd9dd75486eb9c93634870d848371d7d39a1cdf15ffcca916c232992b81bc699ce03720ce93c8596a04569e75607b8d294864339c39d36d1e2c5599b801a2c
+EBUILD network-2.4.2.2.ebuild 758 BLAKE2B 2819d5bc39d51bf150438647c80ebdce4866ca157067a1c977a12c10956a643ee44e0b114b9b5d0b42b7c9f2e34c7cbd51b684b32149b887241a6a080305ffdc SHA512 d2125d0b4f87eacd80b54372079845fc84874ab109b090355fcc34255038d6948b51554029b4c32f7589f0b1f33a54e8ceeebcc9eb44ba043f0a0e37b6b41e78
+EBUILD network-2.5.0.0.ebuild 755 BLAKE2B b77cb39fcee710dddbdd4101d8c97ff7dd742b243d7cac6ed414c9798e5adb11bd8936d0173521f32055d5bec2158f9d8c9b967a0b2354801d582e99fddd5bd3 SHA512 49dba2a456580116bbbb7abb2ffd9a4657a3a13e150bc2a614489757c9eda1431e945ec723cd5c7b388b3cd4e870cfe52e369b795ea4f8b86f91f4f430d7a046
+EBUILD network-2.6.2.1.ebuild 678 BLAKE2B 16b5cc82917dad4143fd675349c0cb305b9921e92cc227618b1e7b5d2fec909acc07549ec6f6df3af71b01e35f3146f19ffbbb0d0b51a1d3bafac919281d735f SHA512 d842ea40356e12b2b39662b4071e8fd6cbea31b8cc355e759b3abb6dd0ebbd2e0835d1b36aa1b0ad4510a4ac4db9a9b2ae8499145c6a59af02f0422afda63e5d
+EBUILD network-2.6.3.1-r1.ebuild 778 BLAKE2B 59582d19b505304d607bcd1a4f9e419e943637041dc59e4152cf9dca87cfc3662824f67d9baa08f49570d3c89bd699e06d805573d4c8abf4e8470e39b6ce86ea SHA512 ba43a8a101e94807172e26c53a112cd6987f64fdb036b3dab110273859353570b1a879fc78a4ab6eec61f52f7bbdddd776aecbb4b6263f3f80e92b27342dd519
 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-2.4.1.2.ebuild b/dev-haskell/network/network-2.4.1.2.ebuild
index 4fe652f56b35..7a25e4569cbd 100644
--- a/dev-haskell/network/network-2.4.1.2.ebuild
+++ b/dev-haskell/network/network-2.4.1.2.ebuild
@@ -1,7 +1,7 @@
 # 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.3.2.9999
 
diff --git a/dev-haskell/network/network-2.4.2.2.ebuild b/dev-haskell/network/network-2.4.2.2.ebuild
index 71b77c4ab690..b1e5665f725e 100644
--- a/dev-haskell/network/network-2.4.2.2.ebuild
+++ b/dev-haskell/network/network-2.4.2.2.ebuild
@@ -1,7 +1,7 @@
-# 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.3.5.9999
 
diff --git a/dev-haskell/network/network-2.5.0.0.ebuild b/dev-haskell/network/network-2.5.0.0.ebuild
index ce69664a4fbb..76338626607e 100644
--- a/dev-haskell/network/network-2.5.0.0.ebuild
+++ b/dev-haskell/network/network-2.5.0.0.ebuild
@@ -1,7 +1,7 @@
-# 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.9999
 
diff --git a/dev-haskell/network/network-2.6.2.1.ebuild b/dev-haskell/network/network-2.6.2.1.ebuild
index ab4c59f42ac8..1af7b932e621 100644
--- a/dev-haskell/network/network-2.6.2.1.ebuild
+++ b/dev-haskell/network/network-2.6.2.1.ebuild
@@ -1,7 +1,7 @@
 # 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
 
diff --git a/dev-haskell/network/network-2.6.3.1-r1.ebuild b/dev-haskell/network/network-2.6.3.1-r1.ebuild
index b1e276c3e6d5..fde706ca8f3a 100644
--- a/dev-haskell/network/network-2.6.3.1-r1.ebuild
+++ b/dev-haskell/network/network-2.6.3.1-r1.ebuild
@@ -1,7 +1,7 @@
-# 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.9999
 
diff --git a/dev-haskell/nonce/Manifest b/dev-haskell/nonce/Manifest
index f8ed547f48f9..0d32c085204e 100644
--- a/dev-haskell/nonce/Manifest
+++ b/dev-haskell/nonce/Manifest
@@ -1,3 +1,3 @@
-DIST nonce-1.0.2.tar.gz 2872 BLAKE2B ca6fe229e9682b91eee7886576eead09f47d259c760fc8e37d4c079ce810fa4ba3e08e53ef175ebe9787e7c921d3ab866fb2a446a116fde4a979d513b494dbdb SHA512 e47ed297c7aaa1ed98b6ce711cbc6653dbcbeba9b132750e588c9134f544e8b92b857f36a9331350711df14259dd0f54e49fa6e0da10e9334c5bf76952431894
-EBUILD nonce-1.0.2.ebuild 977 BLAKE2B 187cb863279190cf846d8293575213d570abe9a0a61788313c23053256ca8f56f571e408c268b7fecdba323735e10e2b45387f06e7a3751471ee64d409509df4 SHA512 66f187b619f5a87d4c872192bd2ac6c5d799e4c46cd31d567142ec0260374d634891cd1da61f526c93d045dd865e0d6af2ff2ff3ef587f11d3ca5bcb181b2a1a
+DIST nonce-1.0.7.tar.gz 2956 BLAKE2B 1b03b7b51c27f44ad9ec095865efb20fa19ef3b60b536970d28e9dc10db870b49600fe9454f804cafdd480b3e5054d5bcc22039d323019b0ac46fda2cb8ba69b SHA512 89fb70578c8f52c652cdb4c1e6243529701bc21685862d7bbc750e2000424a029a8b164bde6c422a38e61944a15a8b788aa4aa70212bca9f12b5eaae801d8db0
+EBUILD nonce-1.0.7.ebuild 897 BLAKE2B 7631e20c6014b32fb326951ad0f13b5719cfcf19098bc65c3b8f8525159461d0f06ffb157c2cbd34fb8e927cfb6e9eb7a56e9f26147e77c1b538acede4521129 SHA512 5c9d25095b18aec39c14ac9e5930f055263807fbdbcadcee2618440108b979cb866427c79e91594e7ebd79e5d31b2bc59f4d9182c6ba096523eeead38c408c2a
 MISC metadata.xml 806 BLAKE2B 6304bb46d197c2b8d88b4bc194e638e29abc7da6819dce3b310c2be1fc63dfba1b7dd03d5be52ba75709354aae8e5979440bb4c882de26040fd6e50ba8853898 SHA512 2e86de83f8508e9a698f2f0c09b1412a484050093fd1aed583bcd6378d6ff801b7956bcb7c261eb1b82825f2600715c7886fd00bf04774c005b8dba79bdc6960
diff --git a/dev-haskell/nonce/nonce-1.0.2.ebuild b/dev-haskell/nonce/nonce-1.0.7.ebuild
index 5c3ac867b5c3..153271b53d81 100644
--- a/dev-haskell/nonce/nonce-1.0.2.ebuild
+++ b/dev-haskell/nonce/nonce-1.0.7.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=6
 
-# ebuild generated by hackport 0.4.5.9999
+# ebuild generated by hackport 0.5.5.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -18,17 +18,19 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/cprng-aes-0.5:=[profile?] <dev-haskell/cprng-aes-0.7:=[profile?]
-	>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
+	>=dev-haskell/entropy-0.3.7:=[profile?]
 	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	dev-haskell/unliftio:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
+	>=dev-haskell/cabal-1.18.1.3
 "
 
 src_prepare() {
+	default
+
 	cabal_chdeps \
-		'base              >= 4.5   && < 4.9' 'base              >= 4.5'
+		'entropy           >= 0.3.7 && < 0.4.2' 'entropy           >= 0.3.7'
 }
diff --git a/dev-haskell/numinstances/Manifest b/dev-haskell/numinstances/Manifest
index ec88dbce808b..2bebc5b9bbcf 100644
--- a/dev-haskell/numinstances/Manifest
+++ b/dev-haskell/numinstances/Manifest
@@ -1,3 +1,3 @@
 DIST NumInstances-1.4.tar.gz 4749 BLAKE2B d25b62c0396c85ceed1bc1fe384a9d6f7a7601c0d1e3952ef482884db91f3a33306be2e2637a58fccd51cafd03ac3e0203ba65906a0c167f97a08726b68d2bd4 SHA512 d36b6d924345142004c3fdfe5d329a8679ddab2763a117d80b7f8a7077cd98961696fdca573578ce2389bc54563a926445cb63c3d3b888a1c54d22bc329236c6
-EBUILD numinstances-1.4.ebuild 628 BLAKE2B b4ff528d299e081c2668e746219ad70cb4dddec33abd09e52879bc697c6ae542b3913b93ccdb3358b1315991a5863a7cd1baeed129a2d98335c8b797351b9cfa SHA512 5b4907e60386e4f7dc8b0692510116dcc73720d19a93d3a2a44794f583db79ca868b7885da9ccc2ec934bbf800c3c18e07db40a44559a386618ba35febb99dd5
-MISC metadata.xml 332 BLAKE2B 3aae28212035da8af83693eb1682d28c102c021fdf04bb7817403d2843cfb6c3f2dbed68df91e655fc0cdbb25ec694aa7a05cf86fa14e53eb0fcc336a1f700f0 SHA512 9cbe2f15b11a7d670b9e42dbcd89b6fa7f202928ca96ff3fa32823fbde58d6f0f12fefe59b70124ac064b5e154c05e20629d1e8bd0067f1152a585854f9b81e5
+EBUILD numinstances-1.4.ebuild 628 BLAKE2B 1c1e6423f32bcfac68aa0b25f8dbb4478dcd20ffab82670be6cb6a23f85faab1c264aa70ef6ea12dd4a399595b6a2abbef3c0a88780660a3d2a2b894831a3219 SHA512 7a09f7d30882051ddb0c46c48cc4c4215467baeab4abcba97cc30fbfa3d207b74225a43eb4e48a5af541e1061a63667d1abff1902039ceda1ca837966add7e4c
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/numinstances/metadata.xml b/dev-haskell/numinstances/metadata.xml
index 0804dfaa3279..b7878815d80d 100644
--- a/dev-haskell/numinstances/metadata.xml
+++ b/dev-haskell/numinstances/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">conal/NumInstances</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/numinstances/numinstances-1.4.ebuild b/dev-haskell/numinstances/numinstances-1.4.ebuild
index 89dfc164e733..99c14d59cbc7 100644
--- a/dev-haskell/numinstances/numinstances-1.4.ebuild
+++ b/dev-haskell/numinstances/numinstances-1.4.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.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/objectname/Manifest b/dev-haskell/objectname/Manifest
index 058737791925..94ebbef7369a 100644
--- a/dev-haskell/objectname/Manifest
+++ b/dev-haskell/objectname/Manifest
@@ -1,3 +1,3 @@
 DIST ObjectName-1.1.0.1.tar.gz 2557 BLAKE2B ba67de5c6bf8dc522dbb245064ceaf9b6498979d511fb0b7624083362c6d954c70e292c03edec1663e4265cf935c5eb833dc4833b2acb17b29f957e6b028a98e SHA512 e0b94813d29ccba4a54c699e039ab101039a9482f594c990547a04f9de511e4d27d5a93fc5f176ea5e3a8d940d31477f0e69dcd6f7c867f67bb117933d2cce64
-EBUILD objectname-1.1.0.1.ebuild 693 BLAKE2B 85daeb5c66aa84e2494baa027aa0b9f2b690c72e402d3567c6a07e66a25867798ddf8a9af2059b9f6f3565164f6b7b7fc93a073eb800ec87117b31747c2faff2 SHA512 e536d7e1f7fbc7e1037bfeac7a7a78000e9f75f0e10952cff02b81e763539fc227d6bddcaebeaf665ad3b4cd27243e3fdff3db3dbdc82d9b3c90af49defb472a
-MISC metadata.xml 596 BLAKE2B a43d8028870e22b19d34519c3ff131a473293aa8f2572657a61489163a6d157064b191b0dee3b8c93b77b05cc40b1c3c4201a688cb4d57e7a0e4aac988fe8cbd SHA512 efce1983ae651b42654dfdfcba73f7c73ebe8dcf725b43bf8ec80e7b9b98c4b5f1611ace0f74147299ea92c4d5d973cd399e116280451cbc6c817f8a6b8f7d7e
+EBUILD objectname-1.1.0.1.ebuild 611 BLAKE2B fc409f0bfe14f51b93842b7a91e16971fba9655f731fbe18799c43ab7ff330a32b0ae51f4c41c3581b1c65d6d038db91fbbf582b632dc788c0fc7675aa5e1019 SHA512 36c7316cebf8278546e7d63247179cb62c0bbebb2b64376e46f93393e4444881faa531b41ec8ea58ea14ec6485349600297ca49ec748e2e9960cbaf5db2e5419
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/objectname/metadata.xml b/dev-haskell/objectname/metadata.xml
index 87310c649b7b..b7878815d80d 100644
--- a/dev-haskell/objectname/metadata.xml
+++ b/dev-haskell/objectname/metadata.xml
@@ -5,12 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This tiny package contains the class ObjectName, which corresponds to the
-		general notion of explicitly handled identifiers for API objects, e.g. a
-		texture object name in OpenGL or a buffer object name in OpenAL.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">haskell-opengl/ObjectName</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/objectname/objectname-1.1.0.1.ebuild b/dev-haskell/objectname/objectname-1.1.0.1.ebuild
index 16c408c15fc4..9c1581f36b04 100644
--- a/dev-haskell/objectname/objectname-1.1.0.1.ebuild
+++ b/dev-haskell/objectname/objectname-1.1.0.1.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.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -20,11 +20,10 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
+	>=dev-haskell/cabal-1.18.1.3
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/old-locale/Manifest b/dev-haskell/old-locale/Manifest
index fba8c63ca278..fce7ffe85799 100644
--- a/dev-haskell/old-locale/Manifest
+++ b/dev-haskell/old-locale/Manifest
@@ -1,3 +1,3 @@
 DIST old-locale-1.0.0.7.tar.gz 3384 BLAKE2B 338edfdfebca9e6658a814199b48ec16b9783f487ec9ba5746c9785d4c7032a7402de8b30c8b1c938695bef9026b8fb842a273f4fb61d79360d7fbe41aeab238 SHA512 34d018cb040de9adce3ddb8cffabe2a0610f6cd0ff5340ee721b7076671bd5cc3e830f58d16e73240df4b068510f7a24fd1995efc38f002b52d228abc4581d6a
-EBUILD old-locale-1.0.0.7.ebuild 740 BLAKE2B d049283930aa07e771a570a0a6cc27d3b5272af328df1e8955bd24e36c245cd02e6f28b4d15bf9b3539539e1186edc9772016e199da8e0b05de859f79a963715 SHA512 fa16d880b515e5e77035b8358e110b56c4f82386bced1047e1f2009f40022e673f5893a0370efd5569728908b4bbcdf9e80c4968fb0fdcc36e314d624a0eaa8f
+EBUILD old-locale-1.0.0.7.ebuild 749 BLAKE2B a95b55b7bafabaaecf949038c9c7818e30b84da1fbb22b8fcd304dbae123ca9bdca811ddfa0c3075456e0a12d355cd4a92e610f09f0d2885151369284f87035c SHA512 203f148c87f664ec70f545499430e8cb8302f5fcf0e9db1ffaa3b015573be5166529ee30f9f73a7cc35b4931fab872af5d87ed01895e5f2156183c7aeed0cb82
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild b/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
index 79bc9454560b..4dd378590025 100644
--- a/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
+++ b/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
@@ -1,7 +1,7 @@
 # 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.4.9999
 
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 CABAL_CORE_LIB_GHC_PV="6.12.* 7.0.* 7.2.* 7.4.* 7.6.* 7.8.*"
 
 src_prepare() {
+	default
 	cabal_chdeps \
 		'base >= 4.2 && < 4.9' 'base >= 4.2'
 }
diff --git a/dev-haskell/old-time/Manifest b/dev-haskell/old-time/Manifest
index a292cfa8ccff..a0b296940401 100644
--- a/dev-haskell/old-time/Manifest
+++ b/dev-haskell/old-time/Manifest
@@ -1,3 +1,3 @@
 DIST old-time-1.1.0.3.tar.gz 74219 BLAKE2B e0f4e6fca5f92fdaf1aec8fbb02d339020e9547acbe23d5b5a00bed3b38e4267653331e4b7fc58f0d62f6158e51d78867f4e3bdd29591dffeab7a132d03f3d6e SHA512 a701c62266f9f3c6dc60eba970b6c25a61bf82b6b8bb6b0073e0e44908598926fe7813a7ae1b1f9da98e4861a8f0565d0bd025cb97307b71c08cb9b0b2e321bb
-EBUILD old-time-1.1.0.3-r1.ebuild 834 BLAKE2B 765f710120cc82440bfd75cf8f61884f4daf67e1e05e57be1330c329e4a94d5b8b35f9da89337af3baa776c6c5da93d80b0c3c6f9dbcff45915393bf0f5374a1 SHA512 18310c773ee4b6b0c91575d787798b3c816eb821d911783423982907bf25dd9b102b9aae46421ac2658162af8849a094af3541001ceb0ebef2d566b6e650646f
+EBUILD old-time-1.1.0.3-r1.ebuild 843 BLAKE2B 2cf23d2227b2336da1099941c39336a7f8db9e1c07808d37ca6839bd2118cbf1c0ece573163ac0bece924139cc7fc63f29df42231d44e0a71c1ce7109f10a089 SHA512 81d0bb7991e857163b977c40fa3744a90b33b7884f1a039e3930933fb9dc729121e58ba7e231373cec254fa21348bc25a4af90e5ff4fd1ca9f16324ca18def8d
 MISC metadata.xml 448 BLAKE2B 34d0199dadaa1847b1b54ad5663e05bb29098eb8541cfa4dabd8ab85d114927d0123fffd5133653823bfbadc7a4f263785c56fcfa0f8dc55189d19002d215b3f SHA512 06c860a7effc26f89667d44037c2f386a867b7f3d27344ab5638040f7c55367b03b298891351923555f717c89c43bcc98d44695f06fa0914094ff456eea9b4d5
diff --git a/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild b/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
index 5e32161147d6..ae3b02d9319e 100644
--- a/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
+++ b/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
@@ -1,7 +1,7 @@
 # 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.4.9999
 
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
 CABAL_CORE_LIB_GHC_PV="6.12.* 7.0.* 7.2.* 7.4.* 7.6.* 7.8.*"
 
 src_prepare() {
+	default
 	cabal_chdeps \
 		'base       >= 4.7 && < 4.9' 'base       >= 4.7'
 }
diff --git a/dev-haskell/options/Manifest b/dev-haskell/options/Manifest
index 6337016a2fe0..5508af9cb99e 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 752 BLAKE2B 134fd68d90508729194b3367bc2c5a2ca0c3221bd5f64deadcc396e80aa35bfd4d5dcb1066f9d59548cfb8497cf65b54cb58b15391768401af27dea2f6546bfa SHA512 58356bc6cfed66c2e5bde9cba0081ac8941eec0148959139e47aa2328e2a55b05fd25e585c1e978bf38d4e4393f8f7bc93ecaff2f8ca10475b5ac49cba5345da
+EBUILD options-1.2.1.1.ebuild 752 BLAKE2B 4fdea3c51d5f371c4fe7f7e396d0273ea1550237cafa7d1712d463e8c9f3cfcc1e36f73592c33dccca0c6cbe9386cec96433df0cf42772b50ae15f80e9f781be SHA512 c9b9e80f640d9b137b699076661599e1e878a073f60c9df70a1c10d6b80a1de28582ffc43f26f99785b47da34897dc439e2fc8aefd0ae51d55f62a50bea7706c
 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 8a12b69409b4..a6d4c06bbb96 100644
--- a/dev-haskell/options/options-1.2.1.1.ebuild
+++ b/dev-haskell/options/options-1.2.1.1.ebuild
@@ -1,7 +1,7 @@
 # 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.4.9999
 
diff --git a/dev-haskell/parsec/Manifest b/dev-haskell/parsec/Manifest
index 42260e492f58..e5ee236d57d3 100644
--- a/dev-haskell/parsec/Manifest
+++ b/dev-haskell/parsec/Manifest
@@ -1,11 +1,5 @@
-DIST parsec-3.1.11.tar.gz 32412 BLAKE2B 7e463d37b1da799820079500d96d719e2f34781ba1d443391d5a49b60c3ad935c6c4e766aaa5963c1128ca12a0070f86b17fcbdf6e96224573742e0f9341c7f6 SHA512 f913c172295b184fc118a59ad5fd66c35133885c39aac62239fc3a1aa98b4741465f67d0cffafc1706262ada42259a4694bfbb9175a399997e5b8840da4a809f
 DIST parsec-3.1.13.0.tar.gz 35207 BLAKE2B d5d39122bdc8117aa45b7fc83c15162ac5d366ede01fbf99a94909c0b8ff6a31b6058bbd52ec6aa2366c6e9b1c909acb78c90a697821f8a88b67fa01c7655ff4 SHA512 4efa52bf5f8cdfe81ea97f1ea0bb5522331217976feaf98bb5ebfdf37f4685263f653de091c0ec0ecb0fc26cf6f8525639f9728c9e92afc154e91c6d4239c9b3
 DIST parsec-3.1.14.0.tar.gz 35688 BLAKE2B 474b14ff35d332339ce07f09ef22cbbdf971de9d9712848eb1c67b7ea4359e46079b67d39f978755c7560c55baf6d5f0d69a425291644a3ff638139a8bbec3ce SHA512 db14f77a2d36da5e540be35f0facb7fa61f2c46057b98039bdf16c06fe9865d5ee47e3523a312201665ca133f3f93855b42f0d0a920b8e233ffc8274075c56d3
-DIST parsec-3.1.5.tar.gz 27894 BLAKE2B 4c0daaa10d2307f59770747662b387cd286b46d27c3dff27c581d0e295f7bc652cc7e6e0f141ce69ef15da2af0e9f612f732b9bf09f17c9bab56dba0dc596481 SHA512 58bd5e1ea878349a678c4a8d77caf42962ab65f801411bbbad4fa1e4f387de743f2f64944b5d7ef82042507552f281f70a7f4b40984a0ca4fd37618a0d1ec662
-DIST parsec-3.1.9.tar.gz 29668 BLAKE2B 296049551258044915936afa0928b0d73b30ec7cbb217b3ac76972cfc3f9cb49efbe5091c49fe1232f5bb24951efc0c56d89b7818046cc5b8edeb67796de28f6 SHA512 bc5209813ad0742c68c275f0ecd3e284b6249d2651f75daf16ad9a776003591217eb7d47fdaad88530af90455fe7d3e014c3c1d7d0893482721d4997b23a2d16
-EBUILD parsec-3.1.11.ebuild 895 BLAKE2B 72471abb8863b9184f5b95ce44f24d6fd8dfcd6391762fb67434a3d9d94e7b494d278ec66436c970a98ed12d3bee269ebab67fc6b06e2b97806703307dd3cf33 SHA512 8e404f687249816f3f1c446f5277ca223dfef15257076d04a40442fe514ddf01508c5f375fcad593d0045192d24c4c4d9578538768a79d7c954b35fb2700835a
 EBUILD parsec-3.1.13.0-r1.ebuild 1487 BLAKE2B 19d19b9a05c77810d032135254746a483e5bec18affb3406b149e58a45202971145f15e41005fe43a989a8b5ca54c12dc54bcd2732458b564c8ac4a7d77f89e8 SHA512 c0182c6ecbbb800a305016f38f3a115c9eece16201208362f7fd3c86833d0ef2e1e7b3aee7bb36cc8cd187cfb849bef748466324f59599f228b53e961917f446
 EBUILD parsec-3.1.14.0.ebuild 1441 BLAKE2B 7f3f319d9851e01b930c0df7ba15d945176e0a170263d41349f5da32d89f137c873ef58c4400cd9ed03be03aa5d1c3f5a00ffb55ce86051c1edc68244c1528cc SHA512 e634c34f9a3b3a41fcdea553067693e25a8f2723769ceb1dc6a9452e58e9ab2e6a09680e57f666e888b39fa62cb351d0e650cc0fede6d77db42851d700be8edc
-EBUILD parsec-3.1.5.ebuild 690 BLAKE2B 848efbc09186347b7cb4a86d3e8be7797688706a3e7e5bb299d9095bf26406d92db14d755145990dc5ef1ea87605215e21a40b55b2def2bf98f8a7a94ae1844b SHA512 0a2149e9e47c23f12936dea2328028f7070938b6c498f389d80bdb1a57df2c8e98b19410a1794a2d6737e24caa813e80a7cd093d444cd217ab77d071753b78ea
-EBUILD parsec-3.1.9-r1.ebuild 943 BLAKE2B 3a7e7691f928143aab2b29370c9454ed916a1e70a45acdb5a01d2f10b7c0126f03726367af2caf8e50460f280337f446ce5f83ba15c2a941d3641114bee82436 SHA512 72cef209373f718541edcceb553fe5007af9387acfb59a69f9fbf3f8b6a8636971d9196710fa8cf5fb388ef520e13f2c1a7d5e049e9bdb664ef2076b02947aac
 MISC metadata.xml 307 BLAKE2B 16cc6920f5961ab10f92062508514149a785fb6011d4c68de20b40083cd8c80cc6e284a1ec8ab90a8937f14ffffe05602e753e91cc25cf2a28664c292fb5aa47 SHA512 bfda6d40cdde23fd32b6640ef6089cf3060a0d608ae4ba12954df60fd27d86fd3c0e1336a362754927bb00651db8e1a541be195c4cc464fd8bb417f3811b7a51
diff --git a/dev-haskell/parsec/parsec-3.1.11.ebuild b/dev-haskell/parsec/parsec-3.1.11.ebuild
deleted file mode 100644
index 5cf1bcd1d0b2..000000000000
--- a/dev-haskell/parsec/parsec-3.1.11.ebuild
+++ /dev/null
@@ -1,29 +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 test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/aslatter/parsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/parsec/parsec-3.1.5.ebuild b/dev-haskell/parsec/parsec-3.1.5.ebuild
deleted file mode 100644
index ff5420a91684..000000000000
--- a/dev-haskell/parsec/parsec-3.1.5.ebuild
+++ /dev/null
@@ -1,26 +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="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="http://www.cs.uu.nl/~daan/parsec.html"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/parsec/parsec-3.1.9-r1.ebuild b/dev-haskell/parsec/parsec-3.1.9-r1.ebuild
deleted file mode 100644
index f5970d8f255d..000000000000
--- a/dev-haskell/parsec/parsec-3.1.9-r1.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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/aslatter/parsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'HUnit == 1.2.*' 'HUnit >= 1.2'
-}
diff --git a/dev-haskell/path-pieces/Manifest b/dev-haskell/path-pieces/Manifest
index a2112b6c5322..49b83f67247e 100644
--- a/dev-haskell/path-pieces/Manifest
+++ b/dev-haskell/path-pieces/Manifest
@@ -1,3 +1,3 @@
 DIST path-pieces-0.2.1.tar.gz 3529 BLAKE2B e3b34a630ec0cf69531c46604060efcbe287a45e4fd5b0fb8f76768b605943957d5a99dd3ebee16073e965906ded52584062fbeb4bd4b635c6511b47565c57f2 SHA512 83b8bda16db42ed347e2caa1978f195faf161f53beaaccbf450d21b29b9ae9fc04bcdf8dd17a0db2e11eb9e5bfeddcb605237325c7aaf4ec5cc3402b859674c0
-EBUILD path-pieces-0.2.1.ebuild 657 BLAKE2B 21a78fa024ec9fe8d32c0641bcd0937cb620dd68a3479f2f2f09a0b7348f2d8e3161b88f1f6b558a0c574630a26d7d1766769a61fd0e7e7e04bbbf1845477bdc SHA512 a19178de2c4ee987c840cb9ba24396ff99ded26941cf38d533638838f2ead89ad5105597ef890986233f54df64b1e3c3335da012eb4bd07cdfc032a5c89bc0af
+EBUILD path-pieces-0.2.1.ebuild 660 BLAKE2B eeb90244bbc3bf95d340f31f5c517ecaaceaefbc8b7b1d58cf7e27839078fc4d07e2abb5be3e25b919c8345faca36923541283bf66eff3ec061a533d0fb10faa SHA512 b8e83d1082443f7f98e445be198a20cc6ea0286f238f82eacccc4baf484bcada687a2b7933d662073d0dcf052d790954cd5ae74e78819ca17b7bec157238a083
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild b/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
index b61283ae4fe7..e44cb79ef1f3 100644
--- a/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
+++ b/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
@@ -1,9 +1,9 @@
 # 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.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -18,10 +18,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.6.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-1.16.0
 	test? ( >=dev-haskell/hspec-1.3
 		dev-haskell/hunit
 		dev-haskell/quickcheck )
diff --git a/dev-haskell/pcap/Manifest b/dev-haskell/pcap/Manifest
index 71d948fa8fde..c2c756efcf80 100644
--- a/dev-haskell/pcap/Manifest
+++ b/dev-haskell/pcap/Manifest
@@ -1,3 +1,3 @@
 DIST pcap-0.4.5.2.tar.gz 49414 BLAKE2B 3218a30d1b5fe14981578ee95648e0b5f38a6800351645bac7590ece92cadab4f5e2feb67fd9599861751f205240be757e15f0374ad381edeab6f7fb5692bb48 SHA512 75bdaf3700826d94309e7b26f7ed9b367c33df0a7c8e7f4104230f57fff6916c193b0123dbb64f12d2031a1c350d029e471a58ea6bad0dd36de3a40eafbeab33
-EBUILD pcap-0.4.5.2-r1.ebuild 604 BLAKE2B 440beefebc953a8ee9354131324fa7cde773093d6e1f6051eab92f83056bdb4805e9d4a00b17871d7753af3cc5e051a55ed7cd5eb7df52d962e2e64503295cfa SHA512 6a2718339cd8e3233b490b5b7fb0acf5632b344e6b7fbabe3e86f5c49327f3e468db8b2eee1afc236e2d435e258a882e9ea6317ce3feca28411e4412e0937cdf
+EBUILD pcap-0.4.5.2-r1.ebuild 604 BLAKE2B 17a9c0fcda41fb276ab6aaf775f2a7cb00e3846011591363ef6c71922290acea9898a0448cee379ce1f38d9d9eb311646c29887cfb81f09506571e0a7818c3cd SHA512 dd307b36272e90bebfac987441cb70b8c8187f2b0db4bf89277afce67a47908b8a514371ca7ab7e2aad2ee893e0a162c74d04799d5b35f84d33890ea491e27a9
 MISC metadata.xml 373 BLAKE2B af5968589ebdf91afb06bd876d9d3def2d81956f77ea10a48b469a0feaf3dc040959b532c826bc31d0b6648a4fbf538cb2791ee5f35de067c10a2e923755ae70 SHA512 ee085f3850653f22213601bf9aaf8083b963bd01f799ac56540fcc78dea30e444a0e9f597883e70aa640fbf4d6a6835f447344b3de88f535ec7020eba81918a4
diff --git a/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild b/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild
index 378d0711b823..cd8c09c0c381 100644
--- a/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild
+++ b/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild
@@ -1,7 +1,7 @@
-# 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.3.1.9999
 
diff --git a/dev-haskell/pem/Manifest b/dev-haskell/pem/Manifest
index 6d819f7f46f0..e844e31c150a 100644
--- a/dev-haskell/pem/Manifest
+++ b/dev-haskell/pem/Manifest
@@ -1,3 +1,3 @@
-DIST pem-0.2.2.tar.gz 4641 BLAKE2B 488cf8d1ec2dc107657593da3107b98940144772955124fa3c08dfd9963a46d61fdb80fd55520a2dfce130f99351fea4b0c3ff9d3053711d880afcc238f84dbf SHA512 699b13a89c9caa14c25d4a4e1775bc1ccd9b681193622d9638049631dd84b8ddf4e1b25fa5f31b36c8192157c7303b11226917e57d92abc0366bb01bd527b64a
-EBUILD pem-0.2.2.ebuild 817 BLAKE2B 4495eb1b38a5e4f6e272a78ea631e5571ea1d9f686a59cd4a2a3ba752078bc978dd2a621ba2edd616168e1d418e546ded879adffd5371ea23fb700aac1f096e3 SHA512 e5a89916c6f46981892e519d4f4607bc4812f3ec7cefb183c5aec1f0718bb6011da9c06389ad34c2c409cc1a1cf51b8898c9d48491dbe6139781348dee2a56f8
+DIST pem-0.2.4.tar.gz 4717 BLAKE2B f78472c15a78e201b7c5e29e7855af143f0c4f071fcea39175eaa7928be36e48ee65272fbfa822f8f468dc5771c8996683b238c1ed2bd2bbc73f5166efa85992 SHA512 c27531ae89e69cebbeeecdf3cf72b897eb65c2f9b22c898bf88d79664f1b54b592f0e0f2bc007f84ec3b0efee8bd20eee187bf73a2947b2fc7d9f4a7e418872d
+EBUILD pem-0.2.4.ebuild 803 BLAKE2B 9a7309c885876c72cee2fcea29a05e45abc771877e1e647d0c932909820932ffdff5effc45168bf3df8ec49b360f777991e10d9d5a42ac725eedb846cd5a85ff SHA512 fda60efff13cd3ff8a8989efb9f5354668a467b3fa0cdca771df774127343f5979f38ba69651ce0f570363692a6006be4ba891aa7ac0747e8d180da12cc20b92
 MISC metadata.xml 330 BLAKE2B 6e0af7d57c72672369c7ba31b0a6b95627e66fca5a4caaae3e01480fb6ad48ad2a226e832dee2c9b52529a29d57b27c2e920056097b7225e86dad4e50cfda9b8 SHA512 48fc3313ab579ab58a6b6409d5f3cbc52828848c0515fdb43c21f17470d62371dc794d6f8be1e1a1f1007d0e87b0993d5c1e3bf542d07de7e992e478b237c127
diff --git a/dev-haskell/pem/pem-0.2.2.ebuild b/dev-haskell/pem/pem-0.2.4.ebuild
index 5fb5ee3ff2be..7578a04b72aa 100644
--- a/dev-haskell/pem/pem-0.2.2.ebuild
+++ b/dev-haskell/pem/pem-0.2.4.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.9999
+# ebuild generated by hackport 0.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -17,8 +17,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/base64-bytestring-1.0.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
+RDEPEND="dev-haskell/basement:=[profile?]
+	dev-haskell/memory:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-haskell/prelude-extras/Manifest b/dev-haskell/prelude-extras/Manifest
index 0e9a917f1a26..3df1a08e487d 100644
--- a/dev-haskell/prelude-extras/Manifest
+++ b/dev-haskell/prelude-extras/Manifest
@@ -1,3 +1,3 @@
 DIST prelude-extras-0.4.0.3.tar.gz 8141 BLAKE2B 3889146248c758595ccc4dc3a63b31154ee1c412c9f6112b6362fa57aa456184f6121c153553f909436f782c1f6bcea7650f0b5e0c4f72cd18423ebf7a5e041c SHA512 a8a934166ede50654035075978fbd7406245c38d38c2bc90b9349522f93ba2d6a1bd77d8bba3ac47d819c767d15a3f3f6b663defba7a108f8e2f494709b8f76b
-EBUILD prelude-extras-0.4.0.3.ebuild 544 BLAKE2B 9299891a9b64a4b3b750e3d657ac8d82b4521d6e3e293c7523321a29c457ef09146066d82b77cdaaa7a3daddad29c44cc777c31e7466d2e7581e3b4b158a9c9f SHA512 1109265ca5857e394022bf2a5afa172d04829271c74d137798e3ff8f10ba63c14c2af0562be42dc56531f843b5efa378405421c87c663050df6d58ee1fddfa36
-MISC metadata.xml 627 BLAKE2B 5b8bf62eefbaeb44072de463753e94f9807e3302481c6d1a4bed3e031709b23a88e33ce1e3ba8367402eb3870f142644750d370c2286057b2b38dd5080f9beab SHA512 2554f398de1c38ce607adeef2c810df2ce1c9cafcb0bf0a5a901cd061404e7c82a13fc394857cae6c9c5621fbf00f2d34623a960358d40811c6acadc720433ea
+EBUILD prelude-extras-0.4.0.3.ebuild 544 BLAKE2B 42edd19b7693844fc4da87cc29d14127cb917730b90eb8363fb685a78c816defd928230da5c5f1d01474fc4383abd992209ccc8c02aa4b1d92ada23c371a0a66 SHA512 2ac495ca8816d1e5e635396617099e415d55b144a58fc22d32460adffed09931c3656242056be4f2b19d21d6c8f99bdd6fe66975e54d48663fbc17034bf9e9e1
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/prelude-extras/metadata.xml b/dev-haskell/prelude-extras/metadata.xml
index 56725aa37ca5..b7878815d80d 100644
--- a/dev-haskell/prelude-extras/metadata.xml
+++ b/dev-haskell/prelude-extras/metadata.xml
@@ -5,12 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Haskell 98 - higher order versions of Prelude classes to ease programming with polymorphic recursion and reduce UndecidableInstances
-		
-		See &lt;http://flint.cs.yale.edu/trifonov/papers/sqcc.pdf&gt; for further discussion of the approach taken here.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/prelude-extras</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild b/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild
index 5883be8779dc..37b0aaa85f84 100644
--- a/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild
+++ b/dev-haskell/prelude-extras/prelude-extras-0.4.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=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.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/prettyclass/Manifest b/dev-haskell/prettyclass/Manifest
index 4b03fd61d88a..a361e8a55e37 100644
--- a/dev-haskell/prettyclass/Manifest
+++ b/dev-haskell/prettyclass/Manifest
@@ -1,3 +1,3 @@
 DIST prettyclass-1.0.0.0.tar.gz 1542 BLAKE2B b1497565728b2a580f4ff9117a62a2e2013888a07a9893ee207e0392a014373cb17eb9eeff3ce3d30a69dc7d2f5ff6d136e4a00b8bdae3533c8f240658bf6bf4 SHA512 f0785e7780f71ee0f8f6b6ca5db6a82f030f75b34f618ff9ee0025032516114769f4cd4e6094b5fefd13e645a7eece9d87b82c2d4c144dddf5093bc2c600af4a
-EBUILD prettyclass-1.0.0.0.ebuild 546 BLAKE2B f24c37fe5e4a4d090847997a9c72e795f752ae40d2c08a97a60ee0eb4b7e68533f3feaa145b071da56d79ab8d73ff042b8d908ed838250be5f023ebb0be91c2a SHA512 6cdb611c1998ba33fe1ee51faa9e3f413a56b191fec7134e544475622d1b87fce72cc188ae1c2fecc63bf500f80216d5f949d1f12fd97999ad2ea3dc18724fb6
-MISC metadata.xml 453 BLAKE2B 139092d0f8fa3fd37322909088651724ec6b23f1af548c3bedf86db54418d8c0ed5b94bfbbb339d5163b4cb92ef76d217f9af8af79a495eaefc5ad10d0db8cf1 SHA512 99d14083e2f4a0d9fef1c73379d7acde3b802b014ca31e400c322cb0e6320b0166f7d8a16b277fdffcf6382049d81b5d4277d8ed5d6364c3c432bca0366de465
+EBUILD prettyclass-1.0.0.0.ebuild 548 BLAKE2B 59aeed1c10aaa9766cc375c2107f58ee53a3d1d73705a2ade962c3a81c3ed478dcdc34eb21012e3ce47b443055c91e1e39beca182337b3d03da33ccb765afbbf SHA512 0f191c86b7f2189e6a84c2eb0f6162e1869e4a345644f20fa87cb9dedd56d3835d3d40042492475bf2e11fc62bba864d4513b01a4204cd93eb165a02669d5795
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/prettyclass/metadata.xml b/dev-haskell/prettyclass/metadata.xml
index 0ca938268b7c..b7878815d80d 100644
--- a/dev-haskell/prettyclass/metadata.xml
+++ b/dev-haskell/prettyclass/metadata.xml
@@ -5,9 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Pretty printing class similar to Show, based on the HughesPJ
-		pretty printing library.  Provides the pretty printing class
-		and instances for the Prelude types.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/prettyclass/prettyclass-1.0.0.0.ebuild b/dev-haskell/prettyclass/prettyclass-1.0.0.0.ebuild
index f4770ed4a2c1..6f54c307926a 100644
--- a/dev-haskell/prettyclass/prettyclass-1.0.0.0.ebuild
+++ b/dev-haskell/prettyclass/prettyclass-1.0.0.0.ebuild
@@ -1,9 +1,9 @@
 # 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.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,6 +17,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
+	>=dev-haskell/cabal-1.0
+"
diff --git a/dev-haskell/primitive/Manifest b/dev-haskell/primitive/Manifest
index 528e211fd46c..6e633adbb8c9 100644
--- a/dev-haskell/primitive/Manifest
+++ b/dev-haskell/primitive/Manifest
@@ -1,11 +1,3 @@
-DIST primitive-0.5.0.1.tar.gz 10372 BLAKE2B c8b3feb5228db084b0fd41d06ecbabc31fa4d4d09449e6c0798fdab49ca6d1f9030dca3e77ff5993bdf299361d38bbc57d39228d987aa5ee8c203276ce65fe53 SHA512 f52ea7c3b3c8e01949dfb55e158b770375c718151bdd65b0123278334d21fe219711c0d207318d248958b4f39a93a62c66ca77737c7775e3fe3b053dc20b34a8
-DIST primitive-0.5.1.0.tar.gz 10482 BLAKE2B 2507da63606de91bb4f20db6db156fdb5ec16a065658f71b10a2f4a2e9ffa47b3ff1eaf65603064a904f6b52e6724a604459296011a445e4ca6ca0bf6727f2b2 SHA512 23d0d0afc80e2b1a674d93feb059d8b240a81793ffd53f496562b87d7b4abc605f66549ac7f23774d8c36fdf8a6768f02cf15b962c75b5052358a1c8cd1664de
-DIST primitive-0.5.4.0.tar.gz 11966 BLAKE2B e6127adaf508955903569c86fdb8e0a300645d61faee4f7fe31a51847e7d706fce368e4a94007a207c61bcc59c41d6d8a7480e02f06d04a1f3706a95de0083b6 SHA512 8d0203834f09be52aea6a8f46d556340583ec79f8490e240f660326d670ddd67510caef1c30ee7d7374d88b812a9f5761c1528152212e46b56cd7c744f7aa656
-DIST primitive-0.6.1.0.tar.gz 12857 BLAKE2B a18d7685279f13090284c8f6414e3844f2226a4db4e3bd1722f9e04a11cafb2debb431fb1f7181c77375290610a456bc7634837d8886c9e91638bf139d2768c2 SHA512 7d75602732aae7af4ea5fb6678f669b103c5c40035c2fa2cc27d940e911054722d20f1b53865cfd0b430785baa0843de89de7195bb2d72c5bc1e5aeb4fdc5f82
 DIST primitive-0.7.1.0.tar.gz 52184 BLAKE2B c99f4e3bb37981a1c290914636460304203083817be8e83c2d756820b139b185e9594042fa41b9cafce03ae849a55a58899a6787890f81e4d78f7f35c5057c15 SHA512 8ade11d0b2221cfdf042da0263b5b5367a7ca2a9b9e1141844e4a65bb0467df879c92cd3515440d715b59345860c1ec3cb3efd7a3d702269ea15e18692586367
-EBUILD primitive-0.5.0.1.ebuild 589 BLAKE2B f93ac45339c78f7dda9d03c44448d9aa261fc93a8476a9e65f52e4784e03aceb87fddee6d19459043f24047032d251168be0a87fe70047b73ce8c5d0c6a3a784 SHA512 923def469136fb416bd66566103dfdb0060f1c8abcf561bca1f09bcae7d14ac959a5b077412f932c5bb4fb92808e162fd477bb6d1a755b9b79de5302cbf42b48
-EBUILD primitive-0.5.1.0.ebuild 599 BLAKE2B 4e62a32c6f9719e2b7537d8b8190b9afff1d1b1492894bebd236b00c76d9eec6e0ddef204a75faaf09445d03b6e0fdd85c420a1bf4c4f42f00bfdb0355a4aedc SHA512 762ed0105a7d68bc2feec488b103f409911c34d7419f66a15de437501eb28e500c15001f743762dfea06273ecc3de57cb7d872a3399893c17e04e23c14323a6f
-EBUILD primitive-0.5.4.0.ebuild 697 BLAKE2B 81a32e85f634695ec1ea17421284d6f6ae42917aea85b3d6a00e90c3411276c38d056c1f62aae3d5c9a958e67b84cd7e83cd549ea64668e9678ab043cde194bc SHA512 11b0159a56dc7d66510218bdb1bbb253eb6d37e5f6c44b8f6bc4aad1494ba6224f61b70d1e4010e5c818af00687b7a0d2a071e256bade067d7dd2a86ee454328
-EBUILD primitive-0.6.1.0-r1.ebuild 830 BLAKE2B c589a9cd38e97c52c42853b0c41efb3439b538b9665d078453d97f7f1e43abd3a8950db435e0d56adf6acb782a120af0dd6793478b1ba88823f280b19cc37f45 SHA512 a0061d948f1d044593585d3468415e27ab31e334c5d1d473614ff7ff7fac808ed2356ffb7140a7b147021635085972e45df41373ec9c880fd3b176cfaabfb419
 EBUILD primitive-0.7.1.0.ebuild 788 BLAKE2B 19f42b91d661138806bc88ed5177c47f863f1a35a39943a97971b4f587966f6b26ed6fc3b9953f102412ee8d98471d5c3da36f595340d6b705bcb3c707ee3702 SHA512 29d37ff869a662ca52f4901fabb10653b64560a1d2f19d7f47f8d117bce3cb237649a40d569752f99761737c922afb5f6a47bbc5bd7ff4bb8b489a78da4d2e43
 MISC metadata.xml 1013 BLAKE2B ca2e0bc9843f49ef6d42cd1a4e9e55adfee7adfe1fb2d86f6e0b31cfdb685d952940b87c81ba7057ce2c523d16ed9d2085e24a862bcf0c4a1a8bd11312bf08fd SHA512 a0d6b463a62899f7f58a197787d85bd60b3179c2fe3f1a91b17cc521a4d688623680f9cf0a78f1a0baf53093ef52ebf889bdc5642489b0073ae768992b4acea8
diff --git a/dev-haskell/primitive/primitive-0.5.0.1.ebuild b/dev-haskell/primitive/primitive-0.5.0.1.ebuild
deleted file mode 100644
index e64f3129996f..000000000000
--- a/dev-haskell/primitive/primitive-0.5.0.1.ebuild
+++ /dev/null
@@ -1,22 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Primitive memory-related operations"
-HOMEPAGE="http://code.haskell.org/primitive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.3:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/primitive/primitive-0.5.1.0.ebuild b/dev-haskell/primitive/primitive-0.5.1.0.ebuild
deleted file mode 100644
index d25ee93a754a..000000000000
--- a/dev-haskell/primitive/primitive-0.5.1.0.ebuild
+++ /dev/null
@@ -1,24 +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="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Primitive memory-related operations"
-HOMEPAGE="https://github.com/haskell/primitive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/primitive/primitive-0.5.4.0.ebuild b/dev-haskell/primitive/primitive-0.5.4.0.ebuild
deleted file mode 100644
index f7e82a2786fe..000000000000
--- a/dev-haskell/primitive/primitive-0.5.4.0.ebuild
+++ /dev/null
@@ -1,29 +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="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Primitive memory-related operations"
-HOMEPAGE="https://github.com/haskell/primitive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'ghc-prim >= 0.2 && < 0.4' 'ghc-prim >= 0.2 && < 0.5'
-}
diff --git a/dev-haskell/primitive/primitive-0.6.1.0-r1.ebuild b/dev-haskell/primitive/primitive-0.6.1.0-r1.ebuild
deleted file mode 100644
index 5d6b77839a12..000000000000
--- a/dev-haskell/primitive/primitive-0.6.1.0-r1.ebuild
+++ /dev/null
@@ -1,32 +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="Primitive memory-related operations"
-HOMEPAGE="https://github.com/haskell/primitive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4.3 && < 4.9' 'base >= 4.3' \
-		'ghc-prim >= 0.2 && < 0.5' 'ghc-prim >= 0.2' \
-		'transformers >= 0.2 && < 0.5' 'transformers >= 0.2'
-}
diff --git a/dev-haskell/profunctor-extras/Manifest b/dev-haskell/profunctor-extras/Manifest
index 141fa2a6722a..daf417cf697f 100644
--- a/dev-haskell/profunctor-extras/Manifest
+++ b/dev-haskell/profunctor-extras/Manifest
@@ -1,3 +1,3 @@
 DIST profunctor-extras-4.0.tar.gz 2588 BLAKE2B 1bee159f740c3e49797756a54ed5e14053d43458316f19e9f9f0e6882f2f07766b6d5aad915f096a8bfc6d1b08269cd349cf5f56a31c1ba8a1f28f9ea9c59857 SHA512 0bf2000b18ccc5d85be28d48199f1e64c6fc8813b0e08b9e1c7bab756ebfe432c3e3c1e2ae87da81e54b1dac183776348a80f089f595ff318f9447d75ff7e358
-EBUILD profunctor-extras-4.0.ebuild 581 BLAKE2B 3b4c738911525011cfda583ef0ab2ab7cdad4b9ed26b75a0115e55c8364f32bf02b613ec637eafa7ac304607a61f38a819dafa4326578f43d347a54d6b9808ed SHA512 9b49a232e869f9890e177f06821476e0352701b944a61937d169157d8556034c3fa7dafd3533b9a650eb1a22c0786352514e11df1c680cdaebc56774117d74c4
-MISC metadata.xml 529 BLAKE2B 0e2acdc63a6c88321a75a8ca4bcb47f81f0f7fd3bb04703cdbbc3130eb737f5065854e99194f0173af933daa3a53255360455326927429e4f9f5e176c79c8189 SHA512 85e73e5bfec8223f99ce58263d423d1675dbd893e1bcd8b448094be163376881a3fd63dd842f0a6ab9f4a381e365adeab4987ad1af3337d965fc93cb3b0638b0
+EBUILD profunctor-extras-4.0.ebuild 600 BLAKE2B b1fcd68fdee33f84d86a269748bb1077456f4b54712d53d58680538acd93c98e09c8d58bc420d34446f03bde0597319f88b49767c5ef34eea5bb709a08b20318 SHA512 cfdc7d8526f7992c8fb2e815d8d91a364a7a336f58414db2f612e8d399d329a43a90db7f481ce6945ffd3ebfb789179621d9a6e50949b5f6efb537f55e775c5a
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/profunctor-extras/metadata.xml b/dev-haskell/profunctor-extras/metadata.xml
index 41640f988c20..b7878815d80d 100644
--- a/dev-haskell/profunctor-extras/metadata.xml
+++ b/dev-haskell/profunctor-extras/metadata.xml
@@ -5,11 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides a number of utilities and constructions that arise
-		when working with profunctors that require minor extensions to Haskell 98.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/profunctor-extras</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/profunctor-extras/profunctor-extras-4.0.ebuild b/dev-haskell/profunctor-extras/profunctor-extras-4.0.ebuild
index 371cdb56d019..807a59466824 100644
--- a/dev-haskell/profunctor-extras/profunctor-extras-4.0.ebuild
+++ b/dev-haskell/profunctor-extras/profunctor-extras-4.0.ebuild
@@ -1,11 +1,11 @@
-# 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.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="lib profile"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="This package has been absorbed into profunctors 4.0"
@@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/profunctors-4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
+	>=dev-haskell/cabal-1.6
 "
diff --git a/dev-haskell/publicsuffixlist/Manifest b/dev-haskell/publicsuffixlist/Manifest
index 77a1a2adf0d1..a4ad387a7bfe 100644
--- a/dev-haskell/publicsuffixlist/Manifest
+++ b/dev-haskell/publicsuffixlist/Manifest
@@ -1,3 +1,3 @@
 DIST publicsuffixlist-0.1.tar.gz 72704 BLAKE2B e8cf5ec65eccc7a7b335d753057a3ccd877691cd760cabf6b9fdbea5bb595d2051021799756f93048a9b144cae6f2721370df7d869c7cb38fbf00f3d7b6ed6d3 SHA512 ca9035f33eaeb222684574e3be2dfb25d60fb840cf5e7684d816cbf696f90782e86caaf7d39b826e00b444739624432a0c02b23890a17864c416afb2bbcd7dc3
-EBUILD publicsuffixlist-0.1.ebuild 1104 BLAKE2B 8efed2321ba1fb239fe1a9140856215202e1a0c07890d3e910895bd15a6f955ebbddfeacbd563c2d4dffe3109698d1ce2b175de2b8dae98fda6e8b3aad0859cc SHA512 ddb486f075527e2330898f727e47574c6a4e455ea3bab68bace05a7d6084bec6735fabf963faaf1919c868dc712d5f9ec8d3661c44489bc3afd290fd8b51fe01
+EBUILD publicsuffixlist-0.1.ebuild 1096 BLAKE2B ce1c0333f59e5acd4d7ff9d1757a543d6520476ba815f13a3dd0be533d77888072a5a00c50350e3874aeabba813a226ff20a5ef317592d1e23a12edecd4accc6 SHA512 79c96aa1260d52e9313be308f3b0810a2520964cb8402a88f993cd5cf6b716be9164698ae27153cb1209e476467d49971ac943cf04adfdd2a32dc492661d0397
 MISC metadata.xml 540 BLAKE2B 4045c6fa1d2383f0fe2fb0054ee1890bf8f9b04a799df3b00c48a914782462c37f68729a7257e98550fcf60ea4d68875b81bfb7d9dc6b92035eae9272035c7de SHA512 add3c6d951868a529a47d6f5f4f85e8b99dffa035dd47704b54b58159f8f111c05e5bab07b8ae2cdc9b7a3088e6cde97743f9d433196cb5dc0affd9366dae507
diff --git a/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild b/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild
index 6be6c2e78c2d..9957846f6ef3 100644
--- a/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild
+++ b/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.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.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Is a given string a domain suffix?"
-HOMEPAGE="https://hackage.haskell.org/package/publicsuffixlist"
+HOMEPAGE="https://github.com/litherum/publicsuffixlist"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-haskell/punycode/Manifest b/dev-haskell/punycode/Manifest
index 60f52cc92862..ec31cfd12725 100644
--- a/dev-haskell/punycode/Manifest
+++ b/dev-haskell/punycode/Manifest
@@ -1,3 +1,3 @@
 DIST punycode-2.0.tar.gz 6243 BLAKE2B b6a0b5123ea3dbd8b8c28ea56b4cf7425962011224549ece1c3c2c5b6a951e7e8c76c46f33a548f43ec650a42ef98f373769f623b4094ab6e222f5e2b91ce621 SHA512 106ee29667582f0341b993b8fd888046e70aff02bf9a31fb883488ed0f1fe346ae6dacd60ceacf088c056b50cb99d633322f066be391585af9c37fd8e5e4ff44
-EBUILD punycode-2.0.ebuild 786 BLAKE2B e9164b68ca5639bea248c90f3310afde680223cb36d9e9f8113fcc86a8ac5c3899865e111b19b99d7751a052798395d5fc6c8716c601a812266e44728b9ba3f0 SHA512 87f00cbefe511d4a670973e349a2e310069a3f6c1b6d5efa319a3d290ff1fb2fefc6f693dbb508812bc64b1f1bda4e7e34e45da756dee7596815b520677e77aa
+EBUILD punycode-2.0.ebuild 786 BLAKE2B 21e0bfa00b65f36b632591e50a4d05167f64c388f1aa84c93c69b17c69628c7611b9abc8faed1df2f7431ced1066bf39fb4c7a8594d2df91c9741eb36d588a28 SHA512 efcb97b8f969b43b9211c42eecfe9e2a5bc8d4b06ae72a6b67b6bcb5ff7290b39a0be3ac5f5fbc2ccbab7d702ac42747e14d29be9052b480f0f1a03dec6b8b32
 MISC metadata.xml 640 BLAKE2B 471d4516143eb307d40d70cc7675bc6021ead59615a2f27dadad6daa7214225dc74ec87d192779bef70f74aa83da849b6a66faa4bb8185dd5935deae8fcaf4e9 SHA512 8b6a12f34e2649b090b1effb5acdf18f600132a879393560d0d99b9f887047efb2804bb36a244da51def9c3e662de5604f1bbe93d896bcc3c0ffb376edaaa149
diff --git a/dev-haskell/punycode/punycode-2.0.ebuild b/dev-haskell/punycode/punycode-2.0.ebuild
index 1868a53af40f..5bf0e711c377 100644
--- a/dev-haskell/punycode/punycode-2.0.ebuild
+++ b/dev-haskell/punycode/punycode-2.0.ebuild
@@ -1,7 +1,7 @@
-# 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.3.2.9999
 
diff --git a/dev-haskell/pwstore-fast/Manifest b/dev-haskell/pwstore-fast/Manifest
index 9e84025ac8e1..6a4788fecc5d 100644
--- a/dev-haskell/pwstore-fast/Manifest
+++ b/dev-haskell/pwstore-fast/Manifest
@@ -1,3 +1,3 @@
 DIST pwstore-fast-2.4.4.tar.gz 8901 BLAKE2B 27e26a1c934264ea18797c6e5c9bd91dacd00e02ee67a0ec7e39dd51fa10c37b9999b1698800ffdfc7954aced9f3d076a94cc5d423b022af5d0168862e81415a SHA512 707381466d22b9d4cb45884be1df0c1567b11c1ed698b19c968f72b0b68898aa384df5f7c12fb5944ebc2bbcf28fd22c4cefed696d37503ac8b39ab9cdebb0f1
-EBUILD pwstore-fast-2.4.4.ebuild 729 BLAKE2B 39974d2330045874a590635a5f48c96fd0f1cd49bd52982a927fd6cb9973aa2519dc02f705f8859796ed0b7f088559d6f74ad861409d2526ab6a4aa65c7b9250 SHA512 7d82b6b410a5f9836ff5dbb2d89dbe2396e89e352b73fd587040fe82c5420208663996a2453c3ca59fddba5b075f42a7079835004e62e86002663342f3e74a9a
-MISC metadata.xml 761 BLAKE2B e0ae65cafc745bda3d084a2735eda2dfdf5f8ce15d58d97e959c630cb3b4d5cee2117413146838385ac569360fb14e4eb78cbbd720b1da0740ec97f30a6e0c79 SHA512 634067afe08b6634214fb6207f62a30899493a0b0362b92388b4280aaa0d359df70b01145dbc4c15059d7d808409549b56b050385c2eb953fc2341546c3283eb
+EBUILD pwstore-fast-2.4.4.ebuild 691 BLAKE2B 9c7b891813ce512bc0842fb1b196bbe0f074ebacb3f43eb1fa96174477296161acfbc9f5211284cfd07fc53b196356e0c3e8596c29733d6307abdb5d4a88f734 SHA512 dc686866ff2f68c79e84cf7162748cec503b79165538e8deec895c5b2ab911f5000186c642802a11b61ee3ab3d4bbc0f97898e2ec44b936b2f699f7bf2fe17df
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/pwstore-fast/metadata.xml b/dev-haskell/pwstore-fast/metadata.xml
index cdbf6fd8bacc..b7878815d80d 100644
--- a/dev-haskell/pwstore-fast/metadata.xml
+++ b/dev-haskell/pwstore-fast/metadata.xml
@@ -5,17 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		To store passwords securely, they should be salted,
-		then hashed with a slow hash function. This library
-		uses PBKDF1-SHA256, and handles all the details.
-		It uses the cryptohash package for speed; if you need
-		a pure Haskell library, pwstore-purehaskell has the
-		exact same API, but uses only pure Haskell. It is
-		about 25 times slower than this package, but still
-		quite usable.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">PeterScott/pwstore</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/pwstore-fast/pwstore-fast-2.4.4.ebuild b/dev-haskell/pwstore-fast/pwstore-fast-2.4.4.ebuild
index c285f1a28c89..1303a14bfc7d 100644
--- a/dev-haskell/pwstore-fast/pwstore-fast-2.4.4.ebuild
+++ b/dev-haskell/pwstore-fast/pwstore-fast-2.4.4.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.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -18,7 +18,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
-	>=dev-haskell/binary-0.5:=[profile?]
 	>=dev-haskell/byteable-0.1:=[profile?]
 	>=dev-haskell/cryptohash-0.6:=[profile?]
 	>=dev-haskell/random-1:=[profile?]
diff --git a/dev-haskell/quickcheck/Manifest b/dev-haskell/quickcheck/Manifest
index 617ddd641302..0f42307122c6 100644
--- a/dev-haskell/quickcheck/Manifest
+++ b/dev-haskell/quickcheck/Manifest
@@ -5,9 +5,9 @@ DIST QuickCheck-2.8.1.tar.gz 38999 BLAKE2B 6c53c760cfe9ac686f9b41a3a440b25cf84f5
 DIST QuickCheck-2.8.2.tar.gz 39725 BLAKE2B a817a03677fd44fe9554e54b86ba71ba32338845c397e1debd9bc128200f1351acc6262deb1e2b2d26a9c75811b688220c2a02813e7f4ea898953679caa6ba9a SHA512 661b9e5285f56f69f8807ad0679ca4e18d0ac648233d5f6cbcfda548fcfcf3bc1b790c409f66fdf67cc4a3b769a248b43b0cd1abd103ae6d9a596978c5af4aba
 DIST QuickCheck-2.9.2.tar.gz 43417 BLAKE2B e4721bdee29b2e6d4f349758c6355a633fa60574c34fe59a6f7698a4e59ebeec4ad9d01ecd9324723f9495b2819606588c235c74f6243e688d96c4380fec09a9 SHA512 7b8bad1995e6ce5484f627f9edab91cb8d124b63444e9f62b613b0d1558c2639101dd30d6c455e7f66ffa613f704aeead89faceea56eb411ba8ed15472edb917
 EBUILD quickcheck-2.13.2.ebuild 976 BLAKE2B 9a1ba164938a6fe803df96e5b2774dff9f745b222adb9416659c9356aad22d4ca66ca1c3b4e80f20d304e1fa58f518614f5c0811c3d26de2cf225fcc42b59b0b SHA512 aa7f31eca0764df583df869823f8573d3674c96b8674b02ac7b63f33dc186108eb22b283ff4710e2b1f65bdab03e2826b55e393de262fc0fe265a4394682a9c5
-EBUILD quickcheck-2.6.ebuild 823 BLAKE2B 6de24f7f5cb77a57f6098f57599ad671dbc892716fc2486a29e4e521c94dfc8a81b49cf0b92baec0cf12ec28258db9c055cf6e8c3290666720b1ef02a5eb2774 SHA512 adad2ffd14ecb032845ae48d5d6d4483cb9fa6d39aed9fcbc84e75a9fa65cb914ac733a231c30d26ccc83963c096aab8ea4cd989327b9cb0e82ab7d11de3b40b
-EBUILD quickcheck-2.7.6.ebuild 1044 BLAKE2B 24c9c1dfa3f622cb15ccafef1f572e5894fc6cf556209e70916539f000d92b3f411447d0d43c3b45aac4e040c03d770cd0055460eae90dea9033a891b07a9ac2 SHA512 6e54846913092c4600132aeff63071c40de83cb96d482aecfe6132c961adb210819725dd7188ecfe6404ce0985955524b9403f2b08d7f0dddfd5140c17fc77a2
-EBUILD quickcheck-2.8.1.ebuild 1046 BLAKE2B 9788fafc4402430b5325bc4facaa46c93463b1497077e264f482f31203817f16f38a9e6e2c338dd754137d6a226ea7dd5d873e2788f9d5be9982e584ee317e56 SHA512 a72a7db99a161d3be67cd0500f2c4f042548e75470e94e46feddc212f7663362a39a800edcc3f298875e58bad7b09d87b09dfe3df0abde673f7ba4123d819a53
-EBUILD quickcheck-2.8.2.ebuild 1094 BLAKE2B 4b3309a93628c98b7a67e402a1f5b1c8eaf9ffad0317620eedc92b947eb971b6ee6fa6947c0794a03376f88346a21fdd5df3c3a066d8ad209db4aef57f974f2c SHA512 800d6a70c97cf8c110251ffc6d99fe0808dc7aa4faeebd168138c32a7a8adba5b04e14a291c764f1aed3f18b205c87098e3d1e8229bd1f938ff189e05655c52b
+EBUILD quickcheck-2.6.ebuild 823 BLAKE2B 202a875cd67c86cc3cb07ccf620bb3fdd572f368b0677a6741c34c4b439de7a04271debc247c8c9d649e2eaa90967bf047ca34b40cd57d0d49317deaf886aa83 SHA512 5bb3d4ffef89377e1a4a99c926b437f8e07f1cb96b9fcc9f0688abbaeeaac880f0ecfe1fba6f2e1f92caa91230d12a843f714327ce3a197c43585c3323c3d6fc
+EBUILD quickcheck-2.7.6.ebuild 1044 BLAKE2B 71f3664a0a353b9ad1350d075a8e7631df66abd6d5c5599207b5b72c745533e64062332a06879ac6967106d21ee1aa12dda37fe041113dcf283323ad39c20896 SHA512 43dbd94d30e51648f513eab2eb21301f305377ee82dbf317e0a6ac2643489adf05cf1939c64eb7d974f0c89710a728c48b460ad3db7c40cb7ea3d95eb3117cc0
+EBUILD quickcheck-2.8.1.ebuild 1046 BLAKE2B 2c8fec98a10a9e2179cba0979e0c5579ac00e17efcc3c566c901ce10710ddd264d8f6536a057347fd4b70228b86aa1bb86526db6ea30a9aca4e5622e83b45745 SHA512 b107f4f98e372c129df3a75590af7fd908e4e5489b85a591121169225ec4c9aef6648fd20579e0cae5d5b35b596ae3f79976860571aa463ca40a2deaf750f2ee
+EBUILD quickcheck-2.8.2.ebuild 1094 BLAKE2B 99032f782c483c391c28dd2389817b0650113ff413922590fb680bef4723c155385a675135c460b566f7925f926a31d43f632a922fe228cffa6888f2b70c60dc SHA512 c2f149a870484c629c4bfeabb5a5773f0c4e5cbb5bd885fb34c5f797639479b828877f27f8dd0de9c726b9910ddae416c616e5c2c9f77d59cf4bb9a2d72f56c4
 EBUILD quickcheck-2.9.2.ebuild 1151 BLAKE2B cce5195f0a40a6a8cbd70ea18331ea06945007627a3d323619f26745840e967fdc2f139d601243a1fb80e3dafcb538c7b1a044025c6596e267b21f7b2f3a612c SHA512 c09eee2a288be870e976e452a4bcb2531cb8c4867fb5e1eeb6a54f6bf15b6a78e5eeda35e5e1778fea7747a53f0a93aaf667559e59fea939c36f97314d94de92
 MISC metadata.xml 1017 BLAKE2B b80c6499a6a27d33fa0226637e26a406a22cd253345b03b311ba3816a90600ee09d1a728f4dc9757e1aa19a6454ac47317530f65cc4aab675913a02ee8fbfd7d SHA512 211c594fe9c5bea938f19f63e867310a0fa28499d9831a38c0afbc136bc717db3ae1a40c582ee9a8be90aa562e59ddc0c2ff1e678afb6a603f5f85cab571901c
diff --git a/dev-haskell/quickcheck/quickcheck-2.6.ebuild b/dev-haskell/quickcheck/quickcheck-2.6.ebuild
index 21e335966b81..83ea176ebf88 100644
--- a/dev-haskell/quickcheck/quickcheck-2.6.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.6.ebuild
@@ -1,7 +1,7 @@
 # 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.3.2.9999
 
diff --git a/dev-haskell/quickcheck/quickcheck-2.7.6.ebuild b/dev-haskell/quickcheck/quickcheck-2.7.6.ebuild
index 0cf65a19c507..40684b1f3f31 100644
--- a/dev-haskell/quickcheck/quickcheck-2.7.6.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.7.6.ebuild
@@ -1,7 +1,7 @@
-# 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.9999
 #hackport: flags: +base4,-base3,templatehaskell:template-haskell
diff --git a/dev-haskell/quickcheck/quickcheck-2.8.1.ebuild b/dev-haskell/quickcheck/quickcheck-2.8.1.ebuild
index 546644688800..f15b3b062c4a 100644
--- a/dev-haskell/quickcheck/quickcheck-2.8.1.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.8.1.ebuild
@@ -1,7 +1,7 @@
-# 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.4.9999
 #hackport: flags: +base4,-base3,templatehaskell:template-haskell
diff --git a/dev-haskell/quickcheck/quickcheck-2.8.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.8.2.ebuild
index bd5b90e9d991..1efe4d1da6cb 100644
--- a/dev-haskell/quickcheck/quickcheck-2.8.2.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.8.2.ebuild
@@ -1,7 +1,7 @@
-# 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.6.9999
 #hackport: flags: +base4,-base3,templatehaskell:template-haskell
diff --git a/dev-haskell/random/Manifest b/dev-haskell/random/Manifest
index 9405a13648bd..f3c88eb0dac1 100644
--- a/dev-haskell/random/Manifest
+++ b/dev-haskell/random/Manifest
@@ -1,3 +1,3 @@
 DIST random-1.1.tar.gz 10870 BLAKE2B e26794bf5dd05b39bdd92afb55abde54d35ff4f7116753ff8b901c8cc18ea71a73fbcb5fc7c1c4a2d35f33ebcf1a3dbbdc0018cb2f8fb1978c35960b95e90606 SHA512 7f128b1c88adfe7ee6405578d3c999bb77e9e3c21e16f82a5197c0ad1d6731851e99e08d8169c6a8b1068ad8a1614c1c0ef8c04c1958337a6e325f1de0c718a3
-EBUILD random-1.1.ebuild 612 BLAKE2B 0bd8f3f5946922f06783b804cde76249a8441eb9fc1616aa48a767b2c02bee9ecbf3e8b1b85fae758f5e2b69777b346d8fab00a8ae7668599b0a94cce6299ab6 SHA512 1d7f64cc755b69413edecbfcf88be31bd515a1084c8d01ede276910b7775d288b412a2f31e679ecfee3b1cb36069206158a36f3505af983f5413fbb395e4ef9c
+EBUILD random-1.1.ebuild 612 BLAKE2B dbd7b439cc31eef24ced76913bcf31614969163fcf394ce80abf5ff230272676a7a24ebf6337e3214a06e4d6b4c98c252669c239fda0ad00aa3efac699bd723d SHA512 9b5beaaa9e55f479a827efc6a2e48b2d2b09dc0a6073a2243060e1fb63f2683519fb7aa50d3cec5dadce9596a24846d0e6c452c0f4d1fe9ff28539fa2e6ba782
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/random/random-1.1.ebuild b/dev-haskell/random/random-1.1.ebuild
index 9a6055fcd458..cac919075a6a 100644
--- a/dev-haskell/random/random-1.1.ebuild
+++ b/dev-haskell/random/random-1.1.ebuild
@@ -1,9 +1,9 @@
 # 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.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/raw-strings-qq/Manifest b/dev-haskell/raw-strings-qq/Manifest
index a7bc1bf8caf2..d3eeb6feb840 100644
--- a/dev-haskell/raw-strings-qq/Manifest
+++ b/dev-haskell/raw-strings-qq/Manifest
@@ -1,3 +1,3 @@
 DIST raw-strings-qq-1.1.tar.gz 3505 BLAKE2B faa8ec645a0515b35766677050ae236a702783b39de93a178f2d445dad1fe24a7222ee3c70aa675bb45d21e560e161db8d6101760c163e1dc39ba9e9c780e616 SHA512 9daf7acad6619c9d077b49591003f2c42baca060b20202f597c7468da765a59add2b78b90d634bbf785e299fb85d39dba242d070e15ec208391059e64850acbc
-EBUILD raw-strings-qq-1.1.ebuild 577 BLAKE2B c9b59e8769e9d940d3332c68178a0808cb92e8bc64a7b8da52b1889dee1bebe05daa74bbfed55b5a101170c915dfe6a2cb5a9b20918f87992414e890b0d43617 SHA512 82cf91993a77ff62b52228e8c83a9a50cd6d70af2f9ce462dd1c8c7a6674582c640e566379b4e847cd57823d3a69a4621c17df0d5c80cadffa46f0c1c028541f
-MISC metadata.xml 792 BLAKE2B 2e914b1a098090b9001e21184d44d7fc5195799cda192325fe3c0d54f049731869d75671601745eef2cd63007d0c1beedc8993c879dbc4c812cbf42fbe65c0b8 SHA512 744697fa2e64edf40cf958168695f8c4f367400e0b174de8fd73911a50aed2848e19497126804cd097ccfd9453bf216d670c0504c87f4cbde913a6c3e11068d1
+EBUILD raw-strings-qq-1.1.ebuild 577 BLAKE2B 1f545214ccc70fa18e4de3d499219766fbb9fd19336222ddb1d508566a98982a59029ab6340d384f19f480753410b61aaef6d49a6927e71d538b81c9ab8479d8 SHA512 e60eea7fb1313ba41932a7b03a55f8dfda4ce7dd960e86192467d6275ebc117b0db78615bc5703e5c62ecc97b218d59b2b06187ebd957f38f9b32d5904e51276
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/raw-strings-qq/metadata.xml b/dev-haskell/raw-strings-qq/metadata.xml
index 5ad95befed52..b7878815d80d 100644
--- a/dev-haskell/raw-strings-qq/metadata.xml
+++ b/dev-haskell/raw-strings-qq/metadata.xml
@@ -1,20 +1,8 @@
-<?xml version='1.0' encoding='UTF-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>
-	<longdescription>
-		A quasiquoter for raw string literals - that is, string literals that don't
-		recognise the standard escape sequences (such as @\'\\n\'@). Basically, they
-		make your code more readable by freeing you from the responsibility to
-		escape backslashes. They are useful when working with regular expressions,
-		DOS/Windows paths and markup languages (such as XML).
-		
-		See @examples/RawRegex.hs@ for a usage example.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">23Skidoo/raw-strings-qq</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/raw-strings-qq/raw-strings-qq-1.1.ebuild b/dev-haskell/raw-strings-qq/raw-strings-qq-1.1.ebuild
index 58b87fc62146..a3fa35fcd57c 100644
--- a/dev-haskell/raw-strings-qq/raw-strings-qq-1.1.ebuild
+++ b/dev-haskell/raw-strings-qq/raw-strings-qq-1.1.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.6.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/refact/Manifest b/dev-haskell/refact/Manifest
index da6d717b69b6..b278f65a0529 100644
--- a/dev-haskell/refact/Manifest
+++ b/dev-haskell/refact/Manifest
@@ -1,3 +1,3 @@
 DIST refact-0.3.0.2.tar.gz 2345 BLAKE2B d92132b057030175eae17cf858349e6e8c86fa02c33651f74b385fe0a2ebec1260ec99993bbb38748af0dafb3bb46b61057195fc4883e93886cf39645d91dfc5 SHA512 18f35a3f563288815645c4ef8e557a08bd9038aca0b3d9af391f9f71b39bbf779b725f037fa682a23e38e31cf7b8e0f4ae412e2af2ec3639c4b2c47a05a45a6e
-EBUILD refact-0.3.0.2.ebuild 556 BLAKE2B 2a8c56120300208c209350822b6c66be0b1eeeb537d5a74420488d0c4e219ec9f468f90b17b6eb38597ed42331ac2c52e7956625a660409ba2a241865e1db229 SHA512 1129d25d8a37eae5cec31237340b50c17af6ed21704a943b09ed53fc67429c3a0955b57c53050235c7e17d120bbbbf95de8caa75d671d26b18c78740412ac015
-MISC metadata.xml 471 BLAKE2B c532a57917bb5b97313b3f3709ab628cb316396468774636e0e15cfcb354c843f748c246504d9c8c6835db4522cf1478be35f692e5593d733bade99e4fd75f71 SHA512 d1175bb42d06db38fa10eff4a1cbe88a29e08616b3046d0224b93df11fb3cc4ac3ca638ab5bfa32a7d06fa36a145f37adec1da823c572f0aab940dbd6e31affd
+EBUILD refact-0.3.0.2.ebuild 556 BLAKE2B a632b3b340a9d47a9570ed3393ac717a0be624aefbb9e9519b79bd51fceac0a449e50868aa88e7a8c276846cf37f22ddb9b31381515790dd8766d386e6412c41 SHA512 20b928d46cf7ac107858d8b56011eb704d45b72dbb4b468d0ca55b9cd3338b2249af78af999072c508bcd381d968b9349260a73a154eeb66ef3245a6693ff8ba
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/refact/metadata.xml b/dev-haskell/refact/metadata.xml
index ddc3a11c7614..b7878815d80d 100644
--- a/dev-haskell/refact/metadata.xml
+++ b/dev-haskell/refact/metadata.xml
@@ -5,8 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library provides a datatype which can be interpreted by apply-refact. It exists
-		as a seperate library so that applications can specify refactorings without depending on GHC.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/refact/refact-0.3.0.2.ebuild b/dev-haskell/refact/refact-0.3.0.2.ebuild
index 59d069732cb5..e0ed59135797 100644
--- a/dev-haskell/refact/refact-0.3.0.2.ebuild
+++ b/dev-haskell/refact/refact-0.3.0.2.ebuild
@@ -1,9 +1,9 @@
 # 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.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/regex-applicative/Manifest b/dev-haskell/regex-applicative/Manifest
index 188ac59ca5c1..419ed8bbcba3 100644
--- a/dev-haskell/regex-applicative/Manifest
+++ b/dev-haskell/regex-applicative/Manifest
@@ -1,3 +1,3 @@
-DIST regex-applicative-0.3.3.tar.gz 13834 BLAKE2B 690d9fe8b44d26cf2332f5474bd1faacec9bae68d72a9dd04836e7bf3519e2dad6a9277f96c9f3dd908091d90408a7dad8d654e60dbb29831267489169ef5192 SHA512 02358efaa912efd232654a404ef5f7cf825b8852bf2c59fd59122047044fcab5ae28bf26de6818b337d917c594fbe165eec917d88b02723e0b181fe2b57ffbe8
-EBUILD regex-applicative-0.3.3.ebuild 747 BLAKE2B 5032ff1b9a8c99e79b6a2739cedd83b2039641349004e59e51d04d7ccc745a02da672ee032164fc6e7fb7094d17f43e656cd663e65ba15e040ce0ab69d677735 SHA512 0df200f4360f4df034bd8542d62f1f26c996d69e341e424bbb437297f337fd1f30c48d01279136eab8524d11ec2e369dcc4390027fd963df4249d01b58de7f16
-MISC metadata.xml 512 BLAKE2B b507deb53b3f4dc832954d0ab59f0d2544d66f32272566dee429fdd4a0a241eae1b39e54fa90721f60e1d437234c20ad43b606b66433bd4eca488527264c9f88 SHA512 f13a38cdc4aaaeb47d1e7f3ab579e69431e9664c9b44b823bc4b8cf327eb7356a938aefee219238410ace03089acbc67fbb4542dac0cdf099d5575d6f37528b0
+DIST regex-applicative-0.3.3.1.tar.gz 14128 BLAKE2B 80488c86dc88b9299384ee6101693567185e4a97defd73398ca1316c813067bf40c4df366b6347628a2f2f40aa42ca6765aed1102a47ef083fd5c193ab78c1bf SHA512 6cef57ef228983b3662616221c6275ffa024bebee4dddf21041e9a8a4efc8b5e905bacdf31534078f9a34b3915a630e823bf0a910c27b11f8a961ee8f87cd9d3
+EBUILD regex-applicative-0.3.3.1.ebuild 687 BLAKE2B 981b02aaccfdc38f3e31d5615c3c0c3ae887bba317318aa68ebeaf411da8ea72334b2c0b67defe0f3e077538f141d516649ed140126fcd51937210beff97e13c SHA512 6ca2bb93e5f773d8298f2b33655a41d4ea9313fdcfaa2838c6a5f124ea069707093c65c4f02f05966964e4c5af93f15b35686be32c54456f30831c507c164ea5
+MISC metadata.xml 420 BLAKE2B 3a07ac0f5acee04c0833f3b7867801965ddcb448e2cbf162a5a2ce21a35fcb21da0c73cb107c6b2599686efdf16faf73d5e356211dc75628b22d78006a674d9b SHA512 2eeea629709cec2b81185505d649eb0e34b35c0bdd8b43cad530a02b192285151518f087514b7e8cbba0e9ce166092fe4e043f224e6190f581b437d6fd8c7c7e
diff --git a/dev-haskell/regex-applicative/metadata.xml b/dev-haskell/regex-applicative/metadata.xml
index ca093b1a6de5..634f648b7bef 100644
--- a/dev-haskell/regex-applicative/metadata.xml
+++ b/dev-haskell/regex-applicative/metadata.xml
@@ -9,7 +9,4 @@
 		regex-applicative is a Haskell library for parsing using regular expressions.
 		Parsers can be built using Applicative interface.
 	</longdescription>
-	<upstream>
-		<remote-id type="github">feuerbach/regex-applicative</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild b/dev-haskell/regex-applicative/regex-applicative-0.3.3.1.ebuild
index 394913aa91ae..22dfbee50406 100644
--- a/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild
+++ b/dev-haskell/regex-applicative/regex-applicative-0.3.3.1.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.6.9999
+# ebuild generated by hackport 0.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,14 +14,13 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
+	>=dev-haskell/cabal-1.18.1.3
 	test? ( >=dev-haskell/smallcheck-1.0
 		dev-haskell/tasty
 		dev-haskell/tasty-hunit
diff --git a/dev-haskell/regex-compat-tdfa/Manifest b/dev-haskell/regex-compat-tdfa/Manifest
index 6f57b186aa10..09075db39723 100644
--- a/dev-haskell/regex-compat-tdfa/Manifest
+++ b/dev-haskell/regex-compat-tdfa/Manifest
@@ -1,3 +1,3 @@
 DIST regex-compat-tdfa-0.95.1.4.tar.gz 4146 BLAKE2B 1749307b8a7bfb1f0a0137febf425191d225bcdfbb0517034ea31e11e648eac128f16cc1951f9471e9f22efeb296c1c32344a375c16381ef823e0fc4674e730f SHA512 7e387a7713ff8e43cfce4262b1288b85f8b60729162a842186bf6a7e1078dfb9e26013087ff7e9bcf81521f8c352926873bb280b9df57b016aef2ca4ce70aa14
-EBUILD regex-compat-tdfa-0.95.1.4.ebuild 683 BLAKE2B 16bce844a1126afdd651d49152f8eee9e1a627f6f42e8956adb941bda977e1834d0af58ede1ed72588c8facb76db93134c479219c8c44930f4555ea15ed1b912 SHA512 269d0e9acd94097fffa33cfa4eda45f807c6082d5b2e6a469c3006d634a1d4fcfde90230ecb41a084db594433ae99ce853eb528e0dcf1219782f1903abbea6c1
-MISC metadata.xml 549 BLAKE2B 511813338e5239e4654ef23d0eb6c138567ced27e54732fd4d38da52c2f212b6ea8f708581e5d3bab0d4bb216099778422e486e23a3bcda95496a97b97d8cc93 SHA512 45610a989f730058dbf3d330daceea8d71f5ce57a9fa2ce8af56dd97d4faabb58e09d92c493bf7d7051a085f53eaa14dc03fef51b14bcee5e0e2bfb337a2fb6a
+EBUILD regex-compat-tdfa-0.95.1.4.ebuild 805 BLAKE2B bfe4f75385f7047bea679257184db1126b18ad8212f6c71b7eaaf4bf3ad011c07d704c7fabef9971ffc1c6bc0c919628e6d1eddd9044a9d34f4cec4474425637 SHA512 be9b4c8945f35b022facfbbf7680edcd50b52f27eb8ac484941ad651bec123c0cf2130434a0c09680edc7f72e0ec34db1516f8d94b82dd327f13daa0c72f4992
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/regex-compat-tdfa/metadata.xml b/dev-haskell/regex-compat-tdfa/metadata.xml
index a4dbf2954c3f..b7878815d80d 100644
--- a/dev-haskell/regex-compat-tdfa/metadata.xml
+++ b/dev-haskell/regex-compat-tdfa/metadata.xml
@@ -5,13 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		One module layer over regex-tdfa to replace Text.Regex.
-		
-		regex-compat can't use Unicode characters correctly because
-		of using regex-posix. This is not good for Unicode users.
-		
-		I modified regex-compat to use regex-tdfa for solving today's
-		problem.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild b/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
index 2e51afb3c933..efe655a7cf3b 100644
--- a/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
+++ b/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
@@ -1,15 +1,16 @@
-# 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.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: +newbase,+splitbase
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Unicode Support version of Text.Regex, using regex-tdfa"
-HOMEPAGE="https://hub.darcs.net/shelarcy/regex-compat-tdfa"
+HOMEPAGE="http://hub.darcs.net/shelarcy/regex-compat-tdfa"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -19,8 +20,14 @@ IUSE=""
 
 RDEPEND=">=dev-haskell/regex-base-0.93:=[profile?]
 	>=dev-haskell/regex-tdfa-1.1.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
+	>=dev-haskell/cabal-1.6
 "
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=newbase \
+		--flag=splitbase
+}
diff --git a/dev-haskell/regex-pcre-builtin/Manifest b/dev-haskell/regex-pcre-builtin/Manifest
index e4808ebcdd54..6ee1a2464a86 100644
--- a/dev-haskell/regex-pcre-builtin/Manifest
+++ b/dev-haskell/regex-pcre-builtin/Manifest
@@ -1,3 +1,3 @@
-DIST regex-pcre-builtin-0.95.1.2.8.43.tar.gz 330306 BLAKE2B bbfc3c509b6d2d5d5dc1affd0519507f90946da4be69b75f12cf687eaf234f98d394d778955507120ed6529d81f199c4ba9b7c8f278706d648e2bc609bdcc51c SHA512 6d11d68636ced3bc443b4f4ff20bee8d431df02eb91a099e31a6a66493a1f7f6674571a45d7d47efc50f8ad8d79f518f28c157cdf97cf3773af590a5a385ddeb
-EBUILD regex-pcre-builtin-0.95.1.2.8.43.ebuild 918 BLAKE2B 7ca28a702accf2c7c2c737d2dfac9d567c75ad2f0e9dda130d60fdf84b68375c6136054c60ce966c49cbd8764986632412faa68345701209ffb6c12c6783e58d SHA512 807b1e53858c6be213311e50e8e7d679f3a4bb50e4b4c2766c2a578c3f01d879044ac07d38532a67494e0b11709999d9f09f5226c7c680fc2ee427955174ba1c
+DIST regex-pcre-builtin-0.95.1.3.8.43.tar.gz 564837 BLAKE2B 57db54ada6996a49ab9ed92ac419e81b0595f531d77c83db783707b70ef2df065375afe7b3aa74d5dd8344aa68470f1cd516376a93dff15beb417dca4745a072 SHA512 1e5cf167e9e46cf0287b37973dcdb7531a5dea5e39d406a931e6d295763c35b8487f31cbe9c3cd5aa2ad8ef76061ce16d7096b0947936c36d91c6d81d1b9c99e
+EBUILD regex-pcre-builtin-0.95.1.3.8.43.ebuild 918 BLAKE2B 7ca28a702accf2c7c2c737d2dfac9d567c75ad2f0e9dda130d60fdf84b68375c6136054c60ce966c49cbd8764986632412faa68345701209ffb6c12c6783e58d SHA512 807b1e53858c6be213311e50e8e7d679f3a4bb50e4b4c2766c2a578c3f01d879044ac07d38532a67494e0b11709999d9f09f5226c7c680fc2ee427955174ba1c
 MISC metadata.xml 329 BLAKE2B 976807788f790a7c988deab4ac793f965df6fd91bde2ea438899e03fec30910c197b89209fdfa22deac55b3ebd3c75157bd96fdc6a331dc19fcbcc78e8ceab03 SHA512 bc36f5519e6ee52f34e5f2c92d222be1ec0206141ac4e3c92da40a7b999cfff4ba5111b6d2908d272e8ef87aa259f92118f28f9a36404f5682ce5e7be7a23ca1
diff --git a/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.95.1.2.8.43.ebuild b/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.95.1.3.8.43.ebuild
index b8e52983ce9a..b8e52983ce9a 100644
--- a/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.95.1.2.8.43.ebuild
+++ b/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.95.1.3.8.43.ebuild
diff --git a/dev-haskell/regex-pcre/Manifest b/dev-haskell/regex-pcre/Manifest
index aee52d234789..598efd8d8700 100644
--- a/dev-haskell/regex-pcre/Manifest
+++ b/dev-haskell/regex-pcre/Manifest
@@ -1,5 +1,3 @@
-DIST regex-pcre-0.94.4.tar.gz 10814 BLAKE2B c6d634e240194d1099b4b6126fedb00bafb9f6118c9b11fff87d862b45e84b87005c6b2337871b17687dc63d15a74203b820aa04dffbae9517af34cc27dce71f SHA512 b14db2fb88f9a70b60cfac0ecc242554929d03982b7ffef18e36a2a8ddbef3bbc3f7f1ccb549aa805aec43f30b3ca22856d2e4315dba15e9c22ed34638dba92e
 DIST regex-pcre-0.95.0.0.tar.gz 9766 BLAKE2B 05df9a80021d436fe1b7c6d6328cf23df96a481d55407f3e737ab70dd92a73f70a06eede4b3355c743cbdb813a1ae422c5aaa1faa30c16608fa04d513317d8ad SHA512 7c9ed0edd0c44d7118313c298c2658858117dd89eb7956566f5bb2fb75f2aaed70d201fda4102c46206b9951013bafee654ff39ed3c4bf9c5086f6c0cc217bdb
-EBUILD regex-pcre-0.94.4-r1.ebuild 732 BLAKE2B 916c9e6a94d047200eac60c561bce413ceb79f04d524bc49c28e7e9796a088343b74673c8382789a5b2be194f4e0397bbd4233aad974f759b93fab2c63f3a0f4 SHA512 088ab116caa3ac4cf1f1a2cd061accc9f4ee64324759ba32fcbb42b46aad7a2badb4d5ef89afbddd57c149f554969e5d3f9972eabbc835fdf0cb7aa4e9b98018
 EBUILD regex-pcre-0.95.0.0.ebuild 990 BLAKE2B 551dd9f5bc45c514ea2524f6afc3a986d4208f43afdedb51c7d51fee624e4769adf3739acddac9f4ddba5bf013381a109890b99d3f60ae0954e4afec6684ff3d SHA512 2042176cc056b0d8542459f0dd804b0cd6cded6e9a9fddfdfeddf10af5ae1eb4dcdfa1fd0547aaf46e2d2a4d0a7779f095d5cba71f2856ff866357b118414398
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/regex-pcre/regex-pcre-0.94.4-r1.ebuild b/dev-haskell/regex-pcre/regex-pcre-0.94.4-r1.ebuild
deleted file mode 100644
index e01d87d20b49..000000000000
--- a/dev-haskell/regex-pcre/regex-pcre-0.94.4-r1.ebuild
+++ /dev/null
@@ -1,33 +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
-#hackport: flags: +newbase,+splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://hackage.haskell.org/package/regex-pcre"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-base-0.93:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=newbase \
-		--flag=splitbase
-}
diff --git a/dev-haskell/resource-pool/Manifest b/dev-haskell/resource-pool/Manifest
index fc62ab3fba5a..96fac84a1eda 100644
--- a/dev-haskell/resource-pool/Manifest
+++ b/dev-haskell/resource-pool/Manifest
@@ -1,3 +1,3 @@
 DIST resource-pool-0.2.3.2.tar.gz 6527 BLAKE2B e57d2406a483f0252cc564de91f74c51b62b9c1e7b52ae147e5c60a647130c2803af469d5b33389a5ff618d259f110738a973580e7633d2ff2dc9e7d57cd82a7 SHA512 42b0bb6dea35c08884f65604acc0dd93707b8d4de780c584877e92fbfe534d4f754282e9c9f7257c203f1152d85ac8170f84ee9a95573343d02a774006c4118b
-EBUILD resource-pool-0.2.3.2.ebuild 893 BLAKE2B ab87974ab4b851cb83c1c49a7a7ae166113ff128782d5a38c8cbce1f6f9e179339d1a88f569c3f4b1a526b5749d11e3fb35aded86e2180f10677ccf6e115908c SHA512 f072a5faf0cc07c9d1aa10522c38135f640cdeecaba120ca8c813174f572c38ceadc1e60cc52149dd16a2ed1c77854292f4327763dc815400c0039798f04c79a
-MISC metadata.xml 497 BLAKE2B 2000412624dbbaca92c36277ebf6235c704b3c5d10c82cb03f759d3fce03476a831090e70cc402be43d275bbd98c9914c658e68957338427818de7d79b9aba8d SHA512 8beb74da34b7c0ee0f919fd08f06d5ff77bf7889a608b569c2fa36ad6f45e0ad83ad4ab19ac17f12e667211d54a2e4107ac06e054734504996cb20d505182707
+EBUILD resource-pool-0.2.3.2.ebuild 860 BLAKE2B 12d07c70f0294ff44fc64486c0107943a12de198a8266155230ba00975ac7e865ce9e842a34e9119cb73a6066f17fcb89022ed40df5ff168ccd40342f3e77ce5 SHA512 d264c3f10d9347af743ce5316519526c4882280050f0dc6ee4bd8c5bc4bd4011f610194a27c34c50316b720f6ecedba21b330921098f391c024ffffeff678f16
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/resource-pool/metadata.xml b/dev-haskell/resource-pool/metadata.xml
index ef1c76317bd9..b7878815d80d 100644
--- a/dev-haskell/resource-pool/metadata.xml
+++ b/dev-haskell/resource-pool/metadata.xml
@@ -5,12 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A high-performance striped pooling abstraction for managing
-		flexibly-sized collections of resources such as database
-		connections.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/pool</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild b/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild
index 14df070eb761..2f9a99428beb 100644
--- a/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild
+++ b/dev-haskell/resource-pool/resource-pool-0.2.3.2.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.4.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: -developer
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
@@ -21,13 +21,12 @@ IUSE=""
 RDEPEND="dev-haskell/hashable:=[profile?]
 	>=dev-haskell/monad-control-0.2.0.1:=[profile?]
 	>=dev-haskell/stm-2.3:=[profile?]
-	dev-haskell/transformers:=[profile?]
 	>=dev-haskell/transformers-base-0.4:=[profile?]
 	>=dev-haskell/vector-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-1.18.1.3
 "
 
 src_configure() {
diff --git a/dev-haskell/safesemaphore/Manifest b/dev-haskell/safesemaphore/Manifest
index 597a0996dae4..2a4041e78cb8 100644
--- a/dev-haskell/safesemaphore/Manifest
+++ b/dev-haskell/safesemaphore/Manifest
@@ -1,3 +1,3 @@
 DIST SafeSemaphore-0.10.1.tar.gz 24007 BLAKE2B c11997a1aba15f8357c1518135c7d78bdb27a6def14ef0da2f94b8530e8ba62a4f4031fca3df040be21474edf8b33e7ccc675d08a5fd855b876fc26f56530ff2 SHA512 877731622e1942f45fcc43e2ed8ba7ddfa2c1f4a7ea4f36cdf425a98acc9c2f54c742d98a7d1bb457ff122f20a5af399ac776bff7403b892353f812e42007250
-EBUILD safesemaphore-0.10.1.ebuild 719 BLAKE2B dd45dab68ec8ee9dfae87e283e618a26091d8ea270821dc2e6d574d03f0ff96bbfbc8c33a8e76fc62e0aa890ac3190d259a2d97630564fbb4fa2ffa58034c743 SHA512 c96ce108587739b040daf4afa9cec07c94825657e99e1652a40664154c2edabf4efcfe96e0c6f732a60f62b9c66b1c91d2139b041cc09ea4e644d6b6ef7e9e0a
-MISC metadata.xml 618 BLAKE2B 4d06569c2983b3f2a3420cca9f02083db9c4784fea665682f04feed365215e44a40f6e4995f26f4ea95587a0a8a2c679638f19e66f432001988a5634fa38a71c SHA512 2b5ae768a93018b8a0b06ab910940681aae25f8305b8016115b7aeae16501c3ab1b14f55f26f2c46ca6cc42106ab9e4ac96adc882dfea64e009ca9e3121af900
+EBUILD safesemaphore-0.10.1.ebuild 721 BLAKE2B 0c0a35e11b0036ef0fcb813daf263fc9ed1016ed37f6f4303595c3a514f0496012d4a7a67367b73598f2c4a5129a9d953223065a2abe46b3737f09164062e40b SHA512 097738a4508f48a9422b10b026fc460c9142e4879a437684a1cbb0ff3349feea2e87d72260685923f3b1d577afaba1ecf800fd0110a3258ead261315f9bbef58
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/safesemaphore/metadata.xml b/dev-haskell/safesemaphore/metadata.xml
index 59189077d61e..b7878815d80d 100644
--- a/dev-haskell/safesemaphore/metadata.xml
+++ b/dev-haskell/safesemaphore/metadata.xml
@@ -5,12 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This provides a much safer semaphore than the QSem, QSemN, SampleVar in base.
-		Those base modules are not exception safe and can be broken by killThread.
-		See &lt;https://github.com/ChrisKuklewicz/SafeSemaphore&gt; for more details.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ChrisKuklewicz/SafeSemaphore</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild b/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
index f094d3f7db59..4d4f9cbbf31d 100644
--- a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
+++ b/dev-haskell/safesemaphore/safesemaphore-0.10.1.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.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/semigroupoid-extras/Manifest b/dev-haskell/semigroupoid-extras/Manifest
index 7aabac305a2b..a978baf286c5 100644
--- a/dev-haskell/semigroupoid-extras/Manifest
+++ b/dev-haskell/semigroupoid-extras/Manifest
@@ -1,3 +1,3 @@
 DIST semigroupoid-extras-5.tar.gz 6026 BLAKE2B e2dbde9a8495d80b61447d7091c682df1945f2ef9489abee3dac3c80a5f5c5b68b236bc52a038fc9c92c15805f8bd9d3afc640481253e158f48f51996d1065e3 SHA512 1eb8f12ee31b183038fd00705045b825c21b50dcafa58d8416315be99055d3c750dec59ce437b6f983c54237a889b150678dfa089559d361325a95b047cbd95d
-EBUILD semigroupoid-extras-5.ebuild 835 BLAKE2B 9c6ac41150c9042c910dc5ef19ffa73a64a08b52d73ab0a9970c574ca25eb18935d531d9b3995ee307666e56f97e78f1c48c2a0e3801952deb2da28306e521d8 SHA512 b202649fcc57b4b0007cbd5cdadba1bde021f7d3a520aedbc863c9d0f7ca45b0ef52456f2bd1a7e513607fba5087c8292f2a57b019cb6a909addb316171bb3fe
-MISC metadata.xml 605 BLAKE2B 15b7271d5870e778119435992a61eec5ab9ab32ec6ac0b3b8f4fe63c566969287de404d324af8c532c1215c1c72a5d32276dbbbe9c730ba6800ba0b4b3098965 SHA512 b3af9bac509c3bd3e895f42af5cc1f2dfebf0288c9ba96848ff3679de7b54b861f124b95ae14fc37f79c48794b9dec0a05873515e750a1d50186f251716ff35f
+EBUILD semigroupoid-extras-5.ebuild 835 BLAKE2B 10b5ff3337a7b02342259c7777c5f91312a5fd1e827934dbeaa4ba648488d2464e069a2ffb553c1975cd080c9aae5721062e474e8fb9c253abb58c948b694e8e SHA512 a2ec03d42e6a73fb566e533e1c2d3427c454c1d9488dd3c4845f13a7e8b7e6757793e1658e8fb38c9bbe0db98cb87aa3cc191d7727aa00e00b50a5f21a3c9faa
+MISC metadata.xml 514 BLAKE2B 365aa94889e56134c19051aff0f8c13d1499a27f397a5d9163d387488a0993d7130b16ccbfaa15a152e1a607c7038bbe8f0cb2c39dfa144cdd4f60a078724154 SHA512 39a5e2fb369710c95621bb08a5e6c21ec9785ebe948da1d404854cb2bab988e2d5e880e2d1cf0bed497c26bc87a9a4b9e1e0375a5f8e403c0e1eea33e825d7e2
diff --git a/dev-haskell/semigroupoid-extras/metadata.xml b/dev-haskell/semigroupoid-extras/metadata.xml
index 6c1d6892e60f..f3ceafb0c36c 100644
--- a/dev-haskell/semigroupoid-extras/metadata.xml
+++ b/dev-haskell/semigroupoid-extras/metadata.xml
@@ -13,7 +13,4 @@
 			accelerating builds in sandboxes for expert users.
 		</flag>
 	</use>
-	<upstream>
-		<remote-id type="github">ekmett/semigroupoid-extras</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/semigroupoid-extras/semigroupoid-extras-5.ebuild b/dev-haskell/semigroupoid-extras/semigroupoid-extras-5.ebuild
index 2fd125f0d64e..6d6dd2a2a5f8 100644
--- a/dev-haskell/semigroupoid-extras/semigroupoid-extras-5.ebuild
+++ b/dev-haskell/semigroupoid-extras/semigroupoid-extras-5.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.5.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+profunctors"
 
 RDEPEND=">=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
+	>=dev-lang/ghc-7.6.2:=
 	profunctors? ( >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-haskell/semigroups/Manifest b/dev-haskell/semigroups/Manifest
index 4a116a05169e..589aeff60da3 100644
--- a/dev-haskell/semigroups/Manifest
+++ b/dev-haskell/semigroups/Manifest
@@ -1,18 +1,3 @@
-AUX semigroups-0.15.1-trust.patch 1087 BLAKE2B b08f38132e7382e01beef17e801a2dc7a1e3a3eb1e86d089975b89d3f56c159a3e8741a19a17e3ecb710656d49599c94f19cf86d7974c0e51fd2635d8af3d113 SHA512 a31f9764133eae3081e6093c5e2f111f8815ce620b1d41ae3bf968271f694cc7e080542fe85290e6cf5505fd49dd3d5ed219823fda9e47dd94c6c66134c442df
-DIST semigroups-0.11.tar.gz 10152 BLAKE2B 9309b66982ca09e1985e7950f29d18f94f276018d57ed4dfb6e293baf13d7f320120ec835b3db3b19ed20dd7c7376b10adbec16cae608adca782a7fdd696901a SHA512 56eea20181fda3480c562230ff07e73dc5a1e163fb1da87717971cf95c672afc8c3e52fc9b6fbc98c29772f44245d2cd78d0bdf368bbefa84cefdbfe73c4f8e4
-DIST semigroups-0.12.1.tar.gz 10541 BLAKE2B b91cd8dcd00e2cbd82120c68a62cc72db94f70aaba58390c181f2e1629a52efda97c7d97fdc70d6732eff6bf8a5ed4bdcf2ce2f2a393d425c0c2f158c98a77b3 SHA512 309729b99d7912e8a07ef4d57c433e46233e77828c84a3c9ecabe6d17ed5ab28d7b23111c5d55f7324bbedfe512b1cd4a7e698b8177f631629159f6e72f9d4ca
-DIST semigroups-0.12.2.tar.gz 10546 BLAKE2B 65940addc7f040cc9e46a86c73ca821f3eb7b4dcb2f9e320ba8699bfcc1721e5980dc9a0ad4adf3549fa1c1989b08ccabb88cab9d669594a2c412333d060bcd1 SHA512 20bc7c2273752b6377d2aea662eeb62dbfc020f07767e4c822c8d5072c8803e4b525ca96a2fe02a0a4d28d9268f91d4f87735506ba4c4bccf5491b1f4da7a753
-DIST semigroups-0.15.1.tar.gz 11715 BLAKE2B 1c755b29b80663bc11c55c9f2b1863c7d62ffee88466a623181d7552ea4eeae5cc3f3481855197f738c59e21c50ddd527da268bde378d592a72d5ae947231c88 SHA512 416bbf402f2e928fae81ba955d48d0fa636f6451c1a7ff02bcca2ff44b4e34eb91d8f2bfa39316e646d8bf2c7829858d795bb93640e70be049b232d1ec74d886
-DIST semigroups-0.16.2.2.tar.gz 15159 BLAKE2B eda7050147fb9aaca8051922601a42e19e84282cf88958a60ab66eea2a544e32b6034272f3cf3f07109aa15df73e81b352c818f4b20d1be6b71e459f8c0b8c98 SHA512 c40d666ae14f0f1052db3887b9327282ef2c535becda8bf2aa4dd8688d1744a738a6e7227e69c1b99255433e0673d67efaea287e26236cca2b13c3db951c30b3
-DIST semigroups-0.18.2.tar.gz 17026 BLAKE2B 68112f907b9251656751987f476dee67fd4e2a31b4f2cc81071558f6298933bf8904442eda053eb520cf505d255ec256e54060182a2474d543c8044506ac5b59 SHA512 db43500859eb041eee800727f1606a96bb9367fa7032bb15ee02b7d34a9d5e46bd8d4ce991988058b05b75816351f837e180e1f8df7dda78548cf3fde7a57e45
 DIST semigroups-0.18.5.tar.gz 20162 BLAKE2B 6580b1f1ac5bf85aced9dfaea1fc8d6daf4a0536395428f629af651b3717d06d36a33b1d50e38e0b420937cead33fa986d060243a788d83e440dfd73b5413572 SHA512 c1a3376041ea32e9f4ddae79ad5ec649ff3a09c5e0a07ac4f731c05b7615ac2c33deadd24c5c9ee81a6747373ae928f3b3bcaa131dce7a7ff1e3efa56cf57db3
-DIST semigroups-0.9.2.tar.gz 9653 BLAKE2B b73901c69a6321ffc478f79a7fb7280074010e512955f7aed5dc4f91742b4838b0a821ebc7aca23d259b0fc38589ddfb18c27a2f163843f729d4c93f65487066 SHA512 43385abeed142425fe858632f0bab265e8dda078ab24b270c0b22f798270af502ccff28863200c330fc4e2bdf88fd625b60be25480a9879328e517b2db09c2e0
-EBUILD semigroups-0.11-r1.ebuild 921 BLAKE2B b2e5382ba9b18c24c5fc143e962c972db6e72d11b6571dfce7608173540dbf072a55ccdba445d97211325f7ce30ca8961d06cfefbb23287685662c766c80cc44 SHA512 68ab9d6ecfc88989d03072acf2dd15f0f8ed6a6c7aa6bcc6ab42f4ab50200b11cf09ba42cbd76760073c1dd7c50e128604548335b5aac7d56d1169b521836666
-EBUILD semigroups-0.12.1.ebuild 846 BLAKE2B 549c2a4d55e5569626b269eca5559ddc40179e272d3c86b684ebec9c2b7c2888a821737f90ff0605577c8053ec766fdb4d45c378c642744f27711e2a0599ca21 SHA512 93b95fc9547b09d1a948c2b004c6f5b86f6342c9bfeaec3a8094aca50dfd3a7474cbb970224361bdb2d1922e49a0d2be25cf58f3fd650118f8120f4d1b6fc624
-EBUILD semigroups-0.12.2.ebuild 844 BLAKE2B 3e2aad89c3a786afb69e152c93c9b35f9f1d6ad97449ae1046e295a265436b4c54d237237eb69a2cc5e46c585999617f9767c083503cf0bba90444e87a2e7da0 SHA512 06d7131e2955ef1e98cb7289e30c97fbec96206c9e7cd5507dad81bf8358229cf303812c4fe0e2a94453f7a40b194edbc10e0fc003580697f17dd999cc3955a9
-EBUILD semigroups-0.15.1.ebuild 1268 BLAKE2B 19b63458188b0545d571393b595a51d472532e00ec8fc1383de8bc0389db83607bbad3422a4ef09f70bf4348768b6f669365a473c2f2237cb1744e1e4163d3ff SHA512 c7d91ccb3af401ace1fea85cc969e2e38fd0933ca33bec3d787d648745465efd1ebf5d911bb29693aefbae21ec7f4b3a649adc9092eaaa74228cb2708912adcb
-EBUILD semigroups-0.16.2.2.ebuild 1253 BLAKE2B 24b1dd626ec79427c6535348e73e1b5bd3e309a08e4b6243ff79d5b0e94d51f8770c8727203af8e99a9383535edaa7f7ebd618728f78d18c6559fe395736cadb SHA512 69bef876ba2530392a8b73ce9370562fc77a3d5a6fe73f342bb5c965ecb70c0e3a0810b5057b4a14b7d3f96824ede69a37fce0cc17c59f2e2f83334ffffa19ea
-EBUILD semigroups-0.18.2.ebuild 1579 BLAKE2B 359f93c8c20c299bad6aecd2eab10b7f50717cf89427a0a9362d4adec0fb7efdd212224891cd4363d1a8b9cd25a9ab50428eee24e83d8cae11fed4e176ab5744 SHA512 5d685fe2d87c86b4b6780fb2baa7c710d55452bd5ae92b6c38936c4047c133d571b15908e117b8f343876f8dab44bc22b1c76fd1251200d8aa9246dff6cc6f67
 EBUILD semigroups-0.18.5.ebuild 1522 BLAKE2B 80e139211554e01ca6384eb52bebc6d84121244ec5133b6ef3270fb82bb298d1c554c3db03a21fdb903c79dfc6d3241f6d09d594ccd20e48199b92adc05a65db SHA512 fbd9406c2b3a2573b364687b54bedccc9920789007a63be33142c5d950805d8eb1d1cf8386442a40c5ff3f492dfb393aef094313f1df739f33afba95abf4e80b
-EBUILD semigroups-0.9.2.ebuild 560 BLAKE2B 2ca9aee26691a5105d2d0fe55f645977cbff7b0d2f3b6b8adb46196db416d3edefcaf9bf7baa053bca2e49ce148c1f712a9f5bc288dcf9b7767d5f0447799241 SHA512 94f1e0bdc2d9a3379155690c7cf57125b8d657495de365012795497957c0d20f23a53eeb147a5d97a25c74b1ea25fd84d1ce4fd85ec28f8d698cf6535a65a801
-MISC metadata.xml 2414 BLAKE2B 5205548612df4c16ac0a5d789cbc28c65e2d1f0a17eabb3dd43b2f164cfd6d71e472b6adf154fcc90a668b0ef1880f846cbfa738c2096b3d27f2fff081e529f4 SHA512 b92533ce71503fc7367f82cc9e9cfc9e2588bb342ea90aaf109906f344302e501b8f877a013dd576151ea272d9766e6bbc125e9f5aaa35411c62d84eabb0de0b
+MISC metadata.xml 934 BLAKE2B d66c7135c0bb83706d3308b8d85c93ed80e7d23fba514bb705bfc2afd4aff9b515e00ffcc759419beb8eea2ec615f0a0e7a29062d24e7e9e264e57a2fa88c11d SHA512 9dd1aecac95f084467725fcbbe8d65f2c280cc5981d760a0a1711a9edb9071c32c8635b782de9addc7a89c5bb98d3ade749b7a3d21e02d4c6a4d2e5871e776d7
diff --git a/dev-haskell/semigroups/files/semigroups-0.15.1-trust.patch b/dev-haskell/semigroups/files/semigroups-0.15.1-trust.patch
deleted file mode 100644
index ff66afa91a6e..000000000000
--- a/dev-haskell/semigroups/files/semigroups-0.15.1-trust.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 118b29f5404014d0a627767a4c7e8de4f00f9fce
-Author: João Cristóvão <jmacristovao@gmail.com>
-Date:   Wed Jul 23 12:27:29 2014 +0100
-
-    If GHC >= 7.8 module is always Thrustworthy, never safe, due to GHC.Exts
-
-diff --git a/src/Data/List/NonEmpty.hs b/src/Data/List/NonEmpty.hs
-index 8a28020..f3c2db5 100644
---- a/src/Data/List/NonEmpty.hs
-+++ b/src/Data/List/NonEmpty.hs
-@@ -1,7 +1,7 @@
- {-# LANGUAGE CPP #-}
- 
- #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702
--#ifdef MIN_VERSION_hashable
-+#if defined(MIN_VERSION_hashable) || __GLASGOW_HASKELL__ >= 708
- {-# LANGUAGE Trustworthy #-}
- #else
- {-# LANGUAGE Safe #-}
-diff --git a/src/Data/Semigroup.hs b/src/Data/Semigroup.hs
-index 7d41775..88fcbb0 100644
---- a/src/Data/Semigroup.hs
-+++ b/src/Data/Semigroup.hs
-@@ -8,7 +8,7 @@
- #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702
- #define LANGUAGE_DefaultSignatures
- {-# LANGUAGE DefaultSignatures #-}
--#ifdef MIN_VERSION_hashable
-+#if defined(MIN_VERSION_hashable) || __GLASGOW_HASKELL__ >= 708
- {-# LANGUAGE Trustworthy #-}
- #else
- {-# LANGUAGE Safe #-}
diff --git a/dev-haskell/semigroups/metadata.xml b/dev-haskell/semigroups/metadata.xml
index ac1ccc6f6f92..810610e7fa37 100644
--- a/dev-haskell/semigroups/metadata.xml
+++ b/dev-haskell/semigroups/metadata.xml
@@ -17,32 +17,6 @@
 		name semigroup.
 	</longdescription>
 	<use>
-		<flag name="hashable">You can disable the use of the
-		`hashable` package using USE=-hashable. Disabling this is an
-		unsupported configuration, but it may be useful for
-		accelerating builds in sandboxes for expert users. If set we
-		will not supply an instance of `Hashable`.</flag>
-		<flag name="bytestring">You can disable the use of the `bytestring`
-		package using USE=-bytestring. Disabling this is an
-		unsupported configuration, but it may be useful for
-		accelerating builds in sandboxes for expert users.</flag>
-		<flag name="containers">You can disable the use of the `containers`
-		package using USE=-containers. Disabing this is an unsupported
-		configuration, but it may be useful for accelerating builds in
-		sandboxes for expert users.</flag>
-		<flag name="deepseq">You can disable the use of the `deepseq`
-		package using `-f-deepseq`. Disabing this is an unsupported
-		configuration, but it may be useful for accelerating builds in
-		sandboxes for expert users.</flag>
-		<flag name="text">You can disable the use of the `text` package
-		using USE=-text. Disabling this is an unsupported
-		configuration, but it may be useful for accelerating builds in
-		sandboxes for expert users.</flag>
-		<flag name="unordered-containers">You can disable the use of the
-		`unordered-containers` package using
-		USE=-unordered-containers. Disabling this is an unsupported
-		configuration, but it may be useful for accelerating builds in
-		sandboxes for expert users.</flag>
 		<flag name="binary">provide instances for binary package</flag>
 		<flag name="transformers">provide instances for transformers package.</flag>
 	</use>
diff --git a/dev-haskell/semigroups/semigroups-0.11-r1.ebuild b/dev-haskell/semigroups/semigroups-0.11-r1.ebuild
deleted file mode 100644
index 3366842fce59..000000000000
--- a/dev-haskell/semigroups/semigroups-0.11-r1.ebuild
+++ /dev/null
@@ -1,33 +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="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'text                 >= 0.10 && < 0.12' 'text                 >= 0.10'
-}
diff --git a/dev-haskell/semigroups/semigroups-0.12.1.ebuild b/dev-haskell/semigroups/semigroups-0.12.1.ebuild
deleted file mode 100644
index c3c8d3f4b83f..000000000000
--- a/dev-haskell/semigroups/semigroups-0.12.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.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/semigroups/semigroups-0.12.2.ebuild b/dev-haskell/semigroups/semigroups-0.12.2.ebuild
deleted file mode 100644
index c633900ffcdd..000000000000
--- a/dev-haskell/semigroups/semigroups-0.12.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/semigroups/semigroups-0.15.1.ebuild b/dev-haskell/semigroups/semigroups-0.15.1.ebuild
deleted file mode 100644
index 4902b9c09fb5..000000000000
--- a/dev-haskell/semigroups/semigroups-0.15.1.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.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bytestring +containers +hashable +text +unordered-containers"
-
-RDEPEND=">=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-			unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) )
-	text? ( >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-trust.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bytestring bytestring) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag hashable hashable) \
-		$(cabal_flag text text) \
-		$(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/semigroups/semigroups-0.16.2.2.ebuild b/dev-haskell/semigroups/semigroups-0.16.2.2.ebuild
deleted file mode 100644
index 1c51b943602d..000000000000
--- a/dev-haskell/semigroups/semigroups-0.16.2.2.ebuild
+++ /dev/null
@@ -1,38 +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="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bytestring +containers +deepseq +hashable +text +unordered-containers"
-
-RDEPEND=">=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-			unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) )
-	text? ( >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bytestring bytestring) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag deepseq deepseq) \
-		$(cabal_flag hashable hashable) \
-		$(cabal_flag text text) \
-		$(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/semigroups/semigroups-0.18.2.ebuild b/dev-haskell/semigroups/semigroups-0.18.2.ebuild
deleted file mode 100644
index 77a736fb3043..000000000000
--- a/dev-haskell/semigroups/semigroups-0.18.2.ebuild
+++ /dev/null
@@ -1,46 +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: +bytestring,+containers,+deepseq,+hashable,+tagged,+text,+unordered-containers
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+binary +transformers"
-
-RDEPEND=">=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-1:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	binary? ( dev-haskell/binary:=[profile?] )
-	transformers? ( >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag binary binary) \
-		--flag=bytestring \
-		--flag=containers \
-		--flag=deepseq \
-		--flag=hashable \
-		--flag=tagged \
-		--flag=text \
-		$(cabal_flag transformers transformers) \
-		--flag=unordered-containers
-}
diff --git a/dev-haskell/semigroups/semigroups-0.9.2.ebuild b/dev-haskell/semigroups/semigroups-0.9.2.ebuild
deleted file mode 100644
index 2035f8ec7dde..000000000000
--- a/dev-haskell/semigroups/semigroups-0.9.2.ebuild
+++ /dev/null
@@ -1,23 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 semigroups"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/nats-0.1:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/setenv/Manifest b/dev-haskell/setenv/Manifest
index f5c2ee7a5b8b..a1997b1c8220 100644
--- a/dev-haskell/setenv/Manifest
+++ b/dev-haskell/setenv/Manifest
@@ -1,3 +1,3 @@
 DIST setenv-0.1.1.3.tar.gz 2710 BLAKE2B 16076d2a8694e15597b87358a81a4f0ed6b66eec89562c4be597ed7890924297b797fe22e391d62526bd5d1da75768a981b30565443a82433e82bb6965e1c1c1 SHA512 9cce617dcec2c870abed2ffadfc21bc2512b709791a15012f07246ce27fd749e125a16f72e6ef574ae390ecbc512c052c2630ca4c97606a20d11e25da5d2c14a
-EBUILD setenv-0.1.1.3.ebuild 564 BLAKE2B 1d415fd95dc503b07b17a7d4afc1d24905dc689f6a20be1944451e123ec550d1cc31c86be8bf339e4e75eea33d24567721e2fcd52cc4e11185fdbd3b3d384422 SHA512 495b742f37fc482bd0885547e79604670452a7f6ffe421c4026c28750d6634bbc2428d41ce91121510d4eb89ce674617a50925163862db748aea990ae4f5d2fa
+EBUILD setenv-0.1.1.3.ebuild 564 BLAKE2B 56ab5c3891bda26cdff4708e068376a7bd6b1f509980532066eb00d693d993ce23b1d2f9f032a37fc974e0f6b62fe7f1a997586f545490920fcc3ed44a5b9f5b SHA512 b16a196a8da4b1a2ad20f67a2689acbca09f5ea89e340919116e81d9db37aaf4e9eea10bd9e9529d4095c5fef189fac39598ffd6f24822e7ea9c7078db2dfc2d
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/setenv/setenv-0.1.1.3.ebuild b/dev-haskell/setenv/setenv-0.1.1.3.ebuild
index 161f0fb26d6b..6911a94429b3 100644
--- a/dev-haskell/setenv/setenv-0.1.1.3.ebuild
+++ b/dev-haskell/setenv/setenv-0.1.1.3.ebuild
@@ -1,9 +1,9 @@
 # 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.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/shakespeare-css/Manifest b/dev-haskell/shakespeare-css/Manifest
index 388292fb31ee..c7ff4ebadbda 100644
--- a/dev-haskell/shakespeare-css/Manifest
+++ b/dev-haskell/shakespeare-css/Manifest
@@ -1,3 +1,3 @@
 DIST shakespeare-css-1.1.0.tar.gz 1572 BLAKE2B d9c15b65d24ac507c57d013bc440230fa3307e80b5a4a113e8fc7daebb81380c07c86fb18d019c2deed457e18ef6827e36d0d00bd1d2eec08056038b5d1fc2cb SHA512 e855c2be0af9d5d8ed8f9c0ec6e78305a75df983342ebf05300e16c858c28f6316e46cf435f3653c13316dcfbe07ab1fa80e428153a219696eb3de4afd8aacff
-EBUILD shakespeare-css-1.1.0.ebuild 604 BLAKE2B 39a270996a6c232761beb6e2a46bfbf390abf98a33d82eafdfb226761f99be906bb77c3008de6c26ebd7d70c2e62a547a3054c52e800ac66a11edf8ad415cece SHA512 6cf3f3fefb00140fa3762efc62d4595a92624f0eaefa64f7d8116b471b0957b7bb09b1edb022eb18d81e850a388aa3d93a4900ffa080caf9e0032964101b27bd
-MISC metadata.xml 992 BLAKE2B 81bddba95667bf04fee0ffb5cb3b736f7ecf15ec96128b8472325b5bef956ad1aa8978c7b8382aa692cc2d59181ed2a511c594a79ca81651dc34bc509122bd11 SHA512 a389fc962e743a8fe3c2e5ca7186f4ac27828c71340699ec78ee8d4acf26f8c1fcf5c962c0e887cf0b699f075a4a508b8f408f37099bcfc7015d4d8719e64ed5
+EBUILD shakespeare-css-1.1.0.ebuild 627 BLAKE2B aaae202046742060847e96d8515871c828a5e60ae7cc34a0dec50ecd7f4029266f3fcf53c2d52ecfa6b116e3a65e7c5f1d94f4d45080dc7c5354ca6a8aa30f64 SHA512 57383cca65cf94d53c6d4ac69ea739e018c90ae356c27496fcbab45ff2e3ba1b97271ed224cbe5f4cd409f4c21ad917ea1ef67f2485a155cc02b8384207c9ae9
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/shakespeare-css/metadata.xml b/dev-haskell/shakespeare-css/metadata.xml
index 5ed8cf4dd7ca..b7878815d80d 100644
--- a/dev-haskell/shakespeare-css/metadata.xml
+++ b/dev-haskell/shakespeare-css/metadata.xml
@@ -5,13 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		
-		Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
-		In this case, the variable type needs a ToCss instance.
-		
-		This package contains 2 css template languages. The Cassius language uses whitespace to avoid the need for closing brackets and semi-colons. Lucius does not care about whitespace and is a strict superset of css. There are also some significant conveniences added for css.
-		
-		Please see http://docs.yesodweb.com/book/templates for a more thorough description and examples
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/shakespeare-css/shakespeare-css-1.1.0.ebuild b/dev-haskell/shakespeare-css/shakespeare-css-1.1.0.ebuild
index 51666755db07..98f58d694680 100644
--- a/dev-haskell/shakespeare-css/shakespeare-css-1.1.0.ebuild
+++ b/dev-haskell/shakespeare-css/shakespeare-css-1.1.0.ebuild
@@ -1,11 +1,11 @@
-# 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.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="lib profile"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Stick your haskell variables into css at compile time. (deprecated)"
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/shakespeare-i18n/Manifest b/dev-haskell/shakespeare-i18n/Manifest
index edb6134762c2..fe2e29d0131e 100644
--- a/dev-haskell/shakespeare-i18n/Manifest
+++ b/dev-haskell/shakespeare-i18n/Manifest
@@ -1,3 +1,3 @@
 DIST shakespeare-i18n-1.1.0.tar.gz 1440 BLAKE2B badf791117105ee280c73d334a4793a8b7e62accc80ae8615b3925458e1af00342452e4d576d50e49c2251ee52fea30dece9747b73e23e51e0df3ed425c5d6bf SHA512 3e6959a32e5c0cf85ca6875f87b7fcbc430df91750904045f29a7b95a2b26398cf1526daa6b33a7c941b2192c8e9238bdfe1673aa8b7dd2b7cb583a2d9fb0063
-EBUILD shakespeare-i18n-1.1.0.ebuild 596 BLAKE2B 4ffc63c7980bfc947f0350af791047b6840b3c86ad5828e0ab69db9198ad7e6cf88c8cfa2204b03f72046b49ca2aa423dc5861ab9bb92e709fa4c21457d86b56 SHA512 2d9e42443a44269713bd27493c0bde07d2f92f60f7c0e7029ac2285536c5fe49b68c0c7bd93ae7f6a15718b30e791452e95c4caaa112a77239e11e3e0ae0c2a1
-MISC metadata.xml 707 BLAKE2B 91cad3d13c4540a94e6c6a5104b010b35247fc6416cc548dce2478e93689c33322929f3691ed3dd4be32bd261c19bbbb5dd7139b5f0c82fd6a55d43e43e0909f SHA512 1e310d634ac93ad7b7b0b7a9c7d135668771e4a0c80ec7479c0e383d1bdae417366eb6f02cffb9d5f7557c1e0110f8f0c8c1cf27255d1941098678074095aeb5
+EBUILD shakespeare-i18n-1.1.0.ebuild 619 BLAKE2B 752a72ad7978ca113ae3fa7391e918dc17f8cd4342bd19a3f1a616f2dc3f9121b8fe95b1f15dc1ee432c5966986976207eafd5b9fcd73e51f2672b4f2a0b1e49 SHA512 a88f9df6fabc236c390bd64b434d5d4b5fc92a2c3c5bad19ec573e4f58f4e16ca34553dff076e41af3e7d8398c9351949cace9195d3479642d4e88be34e809d1
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/shakespeare-i18n/metadata.xml b/dev-haskell/shakespeare-i18n/metadata.xml
index fa6233cb8c1b..b7878815d80d 100644
--- a/dev-haskell/shakespeare-i18n/metadata.xml
+++ b/dev-haskell/shakespeare-i18n/metadata.xml
@@ -5,9 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package uses the same approach of type-safe URLs to create translated content. It has a simple syntax for translators, while allowing the ful power of Haskell for applying complex grammar rules.
-		
-		This package was spun off from yesod-core, and therefore the Yesod documentation is a good place to start in understanding this package. Please see &lt;http://www.yesodweb.com/book/i18n&gt; for more information.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.1.0.ebuild b/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.1.0.ebuild
index 6cb0953ecb6a..9c89e735416d 100644
--- a/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.1.0.ebuild
+++ b/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.1.0.ebuild
@@ -1,11 +1,11 @@
-# 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.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="lib profile"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="A type-based approach to internationalization. (deprecated)"
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/shakespeare-js/Manifest b/dev-haskell/shakespeare-js/Manifest
index edc4d3e583be..f6d7a306e5da 100644
--- a/dev-haskell/shakespeare-js/Manifest
+++ b/dev-haskell/shakespeare-js/Manifest
@@ -1,3 +1,3 @@
 DIST shakespeare-js-1.3.0.tar.gz 1625 BLAKE2B 4250b58fc0ef3f3052dad4eb46c4aa2309fe62a2a9cce06201b84364801807f303c13745f559decb1e8145d19c36abc626394f00fd506904576805d277a57a8d SHA512 73840c66a7dc287642a81c7f49a89974e68f924a3a57ba6ea85e51457363956e58030c01b64dd8dd5e81eecd25fe99cb4dcd0e0fdb2ccc52e4a257f63a0aeb6a
-EBUILD shakespeare-js-1.3.0.ebuild 610 BLAKE2B 3ea45724c704c207eb9c25922c0572a45d526f92b831810fe099790820e92d91a7fff4d6a6b8f812dbbad4736616f5e43ba25928e4d42d12c2aee1bb113f1a5b SHA512 3a415f75aa8c1f4d5deabc6b1d9ef172ce6e934343f85c874bced0ae705a65d1efdb2c0ce2539ebd12d8491d51ff2ce843dd07a1bb59f0318141e215fbcdb2e1
-MISC metadata.xml 1049 BLAKE2B 4fcab5bf1d89f5230784640aa657d1dff81560d743e82f80009927500d1c00e80a10d9fe44e73f829db7d8c8e847345b370a67609c3556752bffd15dec5cdbdb SHA512 597fc035007f26b96de6d57d8b745c713429d789303e2a58086ce0d5d19cba9174f3d35cef54e65d6f5eef65f78e214dd88f2c4db8501db166a5534134e6c819
+EBUILD shakespeare-js-1.3.0.ebuild 633 BLAKE2B ad2320d80df588878e8e3f360246e896bf33aaa5cfb6557aa40bb406f1086dd190f64c48a27d1fc3ec573eea9d00fce33c7f736e6a1e6713b9f430425a96fd94 SHA512 1172d8b10bf7588fd102b8017d212740b0f726bc5e689d9c2a7c1d665348b0b61a345a6dd7ef9df2ebdd6f250306640f1eb1c17317e6fffc8d6b29064f04c76d
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/shakespeare-js/metadata.xml b/dev-haskell/shakespeare-js/metadata.xml
index 7be317c9494f..b7878815d80d 100644
--- a/dev-haskell/shakespeare-js/metadata.xml
+++ b/dev-haskell/shakespeare-js/metadata.xml
@@ -5,14 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
-		In this case, the variable type needs a ToJavascript instance.
-
-		There is also shakespeare-coffeescript for coffeescript templates. Coffescript is a language that compiles down to javascript. It expects a coffeescript compiler in your path, and variable should be a ToCoffee instance.
-
-		Please see http://docs.yesodweb.com/book/templates for a more thorough description and examples
-
-		shakespeare-js was originally called julius, and shakespeare originated from the hamlet template package.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/shakespeare-js/shakespeare-js-1.3.0.ebuild b/dev-haskell/shakespeare-js/shakespeare-js-1.3.0.ebuild
index 744b7342c285..a8341b1ee479 100644
--- a/dev-haskell/shakespeare-js/shakespeare-js-1.3.0.ebuild
+++ b/dev-haskell/shakespeare-js/shakespeare-js-1.3.0.ebuild
@@ -1,11 +1,11 @@
-# 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.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="lib profile"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Stick your haskell variables into javascript/coffeescript at compile time"
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/shakespeare-text/Manifest b/dev-haskell/shakespeare-text/Manifest
index 5f37d3a2f163..fd6edf029e0f 100644
--- a/dev-haskell/shakespeare-text/Manifest
+++ b/dev-haskell/shakespeare-text/Manifest
@@ -1,3 +1,3 @@
 DIST shakespeare-text-1.1.0.tar.gz 1810 BLAKE2B a352a5efde2437233460a7aa3544f2c2f0d6bb6e68a8b3763fa49ece62e922a89cd8ee11baddff846467756014aa2e44df2fd1cee99ca97523226402bc5d1eef SHA512 45dce0a8ef5e0b45466110fdae3ce73fa6fa053d1c68afc0f7aab20726474b34e7ca3ddde6882e40cd2cd8d37ba2e0f7f4064260879c4dbb81ccd2dd5daadb5b
-EBUILD shakespeare-text-1.1.0.ebuild 607 BLAKE2B 1b9547f93b59011686193524a484655dd74a892a3c94147038adc6a43837279b295f77dcaf34553eb8e4771fb314b5976215b6c3116f0b77d0496e12d4b720a3 SHA512 4d4fc52aebb82c9d688bc51679214d4add18b9f485315a3147c4f494cf220e7071a49f384a864456e898e9749729f5858b01cf74302259f44b4a106f83986ed2
-MISC metadata.xml 1564 BLAKE2B 86ee591e45ff13cf0aa6474ce4d4c9569bb63515f233d4635fec3151f2f5b8a88f8c04c90b97878cf1f521de70af6036ace1e690989575f2258896dd21def0e2 SHA512 39742b1ffaf3052e1e79465a3b0fa0e9792b898256d3bf9c5beca2908678305eaa28a942c671ff6cd653bcf4621b05cc96b16869c58f1b9ec87399707aae20dd
+EBUILD shakespeare-text-1.1.0.ebuild 630 BLAKE2B 996f78e339d6d7c7a89deb58b07e1471458a1e1a8715fc3abf69f4632a0e1afbc49686dfbac626335c38ebcd67bf4849b136c42fb2dc0e33b884a82c553c11b0 SHA512 351cf65008d53760d663da608c323e317274fa61ff44d9478b7dd5a6528534a7ab08f4ae4fe0e4f265b532a0426d36502ed75e5fa56b40c20a90f3bb000061d9
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/shakespeare-text/metadata.xml b/dev-haskell/shakespeare-text/metadata.xml
index 3ce699212101..b7878815d80d 100644
--- a/dev-haskell/shakespeare-text/metadata.xml
+++ b/dev-haskell/shakespeare-text/metadata.xml
@@ -5,18 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		interpolation with quasi-quotation: stick haskell variables into haskell strings
-		
-		Note there is no dependency on haskell-src-extras. If you don't mind that dependency, you may want to look at using these packages: Interpolation, interpolatedstring-perl6, interpolatedstring-qq.
-		
-		This package has 1 other general feature that those others may not (but would be easy to duplicate): instead of using quasi-quoting you can also use an external file. It also has url/embeding interpolation, with \@ and \^, which are used in Yesod.
-		
-		This package also uses blaze-builder for efficiently constructing strings (I am not sure what the other packages use). This might be of interest to you for large templates or performance sensitive code, or otherwise having a nice interface to blaze-builder
-		
-		Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
-		In this case, the variable type needs a ToText instance.
-		
-		Please see http://docs.yesodweb.com/book/templates for a more thorough description and examples of the shakespeare family of template languages.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/shakespeare-text/shakespeare-text-1.1.0.ebuild b/dev-haskell/shakespeare-text/shakespeare-text-1.1.0.ebuild
index fb40d066d48b..fafe698ceb1a 100644
--- a/dev-haskell/shakespeare-text/shakespeare-text-1.1.0.ebuild
+++ b/dev-haskell/shakespeare-text/shakespeare-text-1.1.0.ebuild
@@ -1,11 +1,11 @@
-# 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.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="lib profile"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Interpolation with quasi-quotation: put variables strings (deprecated)"
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/shuffle/Manifest b/dev-haskell/shuffle/Manifest
index 4e36fe02d655..5ef583e2576d 100644
--- a/dev-haskell/shuffle/Manifest
+++ b/dev-haskell/shuffle/Manifest
@@ -1,3 +1,3 @@
 DIST shuffle-0.1.3.3.tar.gz 31685 BLAKE2B 007f91bedca1cd7b7a7d40b3425f528b3e76e5636447b509bfa30ba09894267c51a759ca512a39c8c3c296765b816df28ad6952085e5135f24b6169dfab8d519 SHA512 44fcb34a3a9c251970c132c5a504aa4fe30befbc2829ff8b4f788e797c8a35373c5ed4325fb3e5d5846caf0f566b84c398f53be0c7d33d4392343e4f8655a096
-EBUILD shuffle-0.1.3.3.ebuild 1040 BLAKE2B 0b1c29c23d161a6e3582352890a0b224993862f892b04c6577486f45bb7bd35cf5ce40e9af29f799670155267719ed45db7526cfb3bfc8238ad08e6e99ac79b1 SHA512 f16d8d943998f348907633ec79c73ce5a208efc1638332346d74288a3858e9da05d34d35af6b53190f6478d90850484ed53b451091203b24da4d9086cbd43a6f
+EBUILD shuffle-0.1.3.3.ebuild 1040 BLAKE2B 407cdb6c6b0714bda33c76d6e5ddba70b05398fe59227a2990c7de170c2d5514f1ded64f8fcd2c251c7c7b9f818a51f9706b3cce1815ce1ddde67fb05776dd6b SHA512 c7d70a67b9d8ade01632db7f4a3023068fbbe813c25b590405078eff34a5fa0e12d357aecf2d7725f9037f48c05603e6427828e7981573564967ac66aee3f078
 MISC metadata.xml 435 BLAKE2B 254e6a4b4bc5b625d4032d3a060234792728bfd3302928df4b0d2480f5db577a1f1877c963d3fc6002d080762ee429c7e14e8c23c3b9d65606c3796cdb4ac7d8 SHA512 239c7d73bdfc1097f2faf44f201d26a47d9cebb604b04274f01d1b9eb81bac78eeab10a097ca2d36909beb134f5860734711701fe77b77305f4c816a5b8c4c4c
diff --git a/dev-haskell/shuffle/shuffle-0.1.3.3.ebuild b/dev-haskell/shuffle/shuffle-0.1.3.3.ebuild
index e0fb30c2e64c..8c75f97db9a5 100644
--- a/dev-haskell/shuffle/shuffle-0.1.3.3.ebuild
+++ b/dev-haskell/shuffle/shuffle-0.1.3.3.ebuild
@@ -1,7 +1,7 @@
-# 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
 
diff --git a/dev-haskell/skein/Manifest b/dev-haskell/skein/Manifest
index 72f310661c9e..0faacb663a6f 100644
--- a/dev-haskell/skein/Manifest
+++ b/dev-haskell/skein/Manifest
@@ -1,3 +1,3 @@
 DIST skein-1.0.9.4.tar.gz 134346 BLAKE2B 0161ea5a6de793c7938595d05b98b04f8929f007945fb86ea6c6fc7cef26a7022be00d0546920abbfb0ececcdab3e770acf4a4f468a33582106cd8290e830f2f SHA512 4f449de2db0c9f6a22e3f7375999029c1ab9139ae2e678e5582d5ad05dc8b3c12c99951ede884228579b9acc0243b00b93dca07dd6d1ea314cc0d3d223165c34
-EBUILD skein-1.0.9.4.ebuild 1068 BLAKE2B 9bf606cd05fe22eca0c7190a68fc3944020bc32090d3bddaac037044a5250f1210fd09866df57173cb281f5aa7c3a4dde0803f21dc390005d17a4f2d4a9b9563 SHA512 d4aaf2973723a90fe1feb5bd72d681e693c1f4573531cc2340f257bccdcf6d99276b20402534ec35b21651ae75c70ff33a056e097e441feb7b4817c8e8328d6e
-MISC metadata.xml 1460 BLAKE2B 1dccc7c204fd31f08ed354f0c2e11d0d9a8295b1bb366eab6bc60debf224bd35b50560b89310c148d6f6817934eb120beed9696ab6a6d7a1ce0b6edd1b9049eb SHA512 8979dc64387fe53f66f80484988f55c0e176803a8f3c4f7d09e2e60430609d948292af918190dac0fda114fee9f03b756ba2c6baa5bc8beb2e2d42cbaee00465
+EBUILD skein-1.0.9.4.ebuild 1068 BLAKE2B b4be7e7c851f4fe93f10a832370e7cf4d79a1fc74e9a0752cd334f1421bb1a0c52aa69b7623352bcf85d388ec7cacc2dd7f65b3881b621048e8d8f5043da78df SHA512 65c0d46bd1fbbcbc8e634801041b6f87b12eb8e5bb26f3504275962d01b8de80cb1277e2f8ea6b5be07c1c85ef66a58c7aef684a36d0253ced1996acab9a5148
+MISC metadata.xml 1520 BLAKE2B 685f0105e0cb6dbe17d295356410a81d4f159d359c6f9e07f9783ccede61efa20343ac1dba848d7e62ba7369f91054276edc089c612a6ec6e96d74a656685021 SHA512 a47c5874cc7c4c41d4f4483fb91d1f2364d6e3aa98e9b7e23b5e1b056ff5b95a8b5de71887c273c816ff54438f335b0b690167d3feebbfa8593f064ef9349276
diff --git a/dev-haskell/skein/metadata.xml b/dev-haskell/skein/metadata.xml
index 155e664ff75c..2b5aea896921 100644
--- a/dev-haskell/skein/metadata.xml
+++ b/dev-haskell/skein/metadata.xml
@@ -5,30 +5,30 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<use>
+		<flag name="big-endian">When manually selecting the endianness, use big-endian (default is little-endian).</flag>
+		<flag name="force-endianness">Use a manually selected endian when compiling (see flag 'big-endian').</flag>
+		<flag name="reference">Use the reference implementation instead of the optimized one.</flag>
+	</use>
 	<longdescription>
 		Skein (&lt;http://www.skein-hash.info/&gt;) is a family of fast
 		secure cryptographic hash functions designed by Niels
 		Ferguson, Stefan Lucks, Bruce Schneier, Doug Whiting, Mihir
 		Bellare, Tadayoshi Kohno, Jon Callas and Jesse Walker.
-
+		
 		This package uses bindings to the optimized C implementation
 		of Skein.  We provide a high-level interface (see module
-		"Crypto.Skein") to some of the Skein use cases.  We also
+		&quot;Crypto.Skein&quot;) to some of the Skein use cases.  We also
 		provide a low-level interface (see module
-		"Crypto.Skein.Internal") should you need to use Skein in a
+		&quot;Crypto.Skein.Internal&quot;) should you need to use Skein in a
 		different way.
-
+		
 		Currently we have support for Skein as cryptographic hash
 		function as Skein as a message authentication code
 		(Skein-MAC).  For examples of how to use this package, see
-		"Crypto.Skein" module documentation.
+		&quot;Crypto.Skein&quot; module documentation.
+		
+		This package includes Skein v1.3. Versions of this package
+		before 1.0.0 implemented Skein v1.1.
 	</longdescription>
-	<use>
-		<flag name="big-endian">When manually selecting the endianness, use big-endian (default is little-endian)</flag>
-		<flag name="force-endianness">Use a manually selected endian when compiling (see flag 'big-endian')</flag>
-		<flag name="reference">Use the reference implementation instead of the optimized one</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">meteficha/skein</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/skein/skein-1.0.9.4.ebuild b/dev-haskell/skein/skein-1.0.9.4.ebuild
index 8a09b98425d1..89a3273ac90a 100644
--- a/dev-haskell/skein/skein-1.0.9.4.ebuild
+++ b/dev-haskell/skein/skein-1.0.9.4.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.6.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/snap-core/Manifest b/dev-haskell/snap-core/Manifest
index bfab2a9d7f1c..263a22158f3f 100644
--- a/dev-haskell/snap-core/Manifest
+++ b/dev-haskell/snap-core/Manifest
@@ -1,5 +1,3 @@
-DIST snap-core-1.0.1.0.tar.gz 139670 BLAKE2B 13c0839ef95b2260e1272dbf26c9ee1f8970094e3f9ffea728d760f4bf11a260ad73120495a39305e8d8d05cb39c230db08ae1e4094efcaf7879acf4680f61c3 SHA512 ed862530f235adca6f193c96d45b31705534089c58637bf8d0d9d8cd898db8f25494990e210151adc737c34e3cc59f5e0a47cc6b1e638dae9104e991e27dbe8b
 DIST snap-core-1.0.4.2.tar.gz 163146 BLAKE2B 2fc037fa239eed3771c84ede4ed247f34169fb45464f5724e7d770baa0992409eeff4b066a9eaea3cdebf46a9846dd8ac94dab42deb36047bb26654df5642f9b SHA512 42e710ac58a7d3cf58f9fdeca6c9c4880a94765ee0dc42fbcdaf68a6c2c337e1715f8b89863c7f911232af493bf5622b647d4c962237f211f97d731572fd94f5
-EBUILD snap-core-1.0.1.0.ebuild 2671 BLAKE2B f640e8beceb73f848807f0114bd9f1ac15afb986d7d3e040297ae16253a4c67c6bb143cd515de0c77d57ec9f9a38cfac892b9d995dd25a262baf908ab1e2e04b SHA512 d11fb28227e34fac77e1353e07d1a4c26ec7d5f02e01a5d0c9a6324d8320a2c97dce7d45183020e4892815c06cd0a03f0960e43ce38a2a4e182e75d3c08816fd
 EBUILD snap-core-1.0.4.2.ebuild 3099 BLAKE2B c431c6bf4612b7b4289b5e88c39dc810262f5bde7897b3f6cdf0af64c57959b1eb4db5a20af4e3530185407ac4c719c5690609d1aa9aa254b210c7575a59b7a9 SHA512 f23a16589c48af3d27920e94dafa57ad9a6ea55748a5bb1a936b6697892d38ff4338e418b3e92191739d7385d618f364f267abc2968386a8133485b6d1abb97e
 MISC metadata.xml 1855 BLAKE2B 061e56d781f921b5ad34683a6c5c2192a282567e5efa39c315c50cdf915032d70c66d8f270c76647b47ad5c9bee1b666305dc3d9fa790c941bb9ecd416fdf792 SHA512 f497be0430344459a95055207a06f9b9b2b33c6a0edc2cff99ad89051a5d8f615258aaf94234689d4443a6d30e0c4a6df1dadeba2fe142b1f0c324932691e66f
diff --git a/dev-haskell/snap-core/snap-core-1.0.1.0.ebuild b/dev-haskell/snap-core/snap-core-1.0.1.0.ebuild
deleted file mode 100644
index ef5432515143..000000000000
--- a/dev-haskell/snap-core/snap-core-1.0.1.0.ebuild
+++ /dev/null
@@ -1,55 +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="Snap: A Haskell Web Framework (core interfaces and types)"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug portable"
-
-RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?]
-	>=dev-haskell/readable-0.1:=[profile?] <dev-haskell/readable-0.4:=[profile?]
-	>=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/unix-compat-0.3:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] )
-	!portable? ( >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hashable
-		>=dev-haskell/parallel-3 <dev-haskell/parallel-4
-		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug) \
-		$(cabal_flag portable portable)
-}
diff --git a/dev-haskell/snap-server/Manifest b/dev-haskell/snap-server/Manifest
index 38eb9d9a2feb..08b6a66396e4 100644
--- a/dev-haskell/snap-server/Manifest
+++ b/dev-haskell/snap-server/Manifest
@@ -1,5 +1,3 @@
-DIST snap-server-1.0.1.1.tar.gz 73893 BLAKE2B 35b907d285c099059ec5d1f288252a5e4086d20cf0c81f6992e4d0977340474e2123e8c48cc416c9483f4dcc919a0acd37a73f286f8db84aec546e36912ac422 SHA512 bf3496123c07432cefedc6b03de5f335bb9b3a1e917bac45c0ee6b8d7529a3013d19d21433ce02d3f3caa2091abf0a4415b974470317804d70dfb8c9d46b33bd
 DIST snap-server-1.1.1.2.tar.gz 73645 BLAKE2B 29215ce7f542c56be40ce40711f04f7f0b2ccb568903483dbf99950b3ec7703505440cabcf70d0c6084991fe09931e6312b59b48da5511b407df02318b551600 SHA512 a11bb92ce8774269704ce8c045bddf4aad15816cfb447453e8010bfce7aff2a08b38d3c99a400ab3882cb9e0b2f0b1f9af69adc56c1b28df53dc3fdd44042e30
-EBUILD snap-server-1.0.1.1.ebuild 3294 BLAKE2B 5e9a6469e359ac0c0a0be8a0a5fbb97ac40f50142f90309cb5115f9596e45b5373e67013e5c86ac74a9394f368736ea0c5f054b3fde60181b063ce6c8d7e20ac SHA512 93e4ea44050b7e265575ddac68780d8d3543ef904e2f3476980e3350c4c2c000b7f3802a419cd96aaa02ccdfc9f7d2f4e580a72a069e107c845e288631bb8cbe
 EBUILD snap-server-1.1.1.2.ebuild 3159 BLAKE2B 123e1ff8719f6d9ccb18e73f26702c05b53dfc535fe301209f717b8f7c95001a57d440fe0e4a27b9268a9d3a6ce34e1eeaa2d7fd47dc51fbace8581191a47617 SHA512 8f7e4bc4764de4b8bad79ff93e7d3ef7eead6ad916cc73723ad7d5d71f248a04c1d2d44e0e8dcc0f4c5c6afa248052b0dad50e554aaeb280633d752efded1fea
 MISC metadata.xml 1427 BLAKE2B d190025f7b08e754a96fc40656ea5669e0a15bee559e5d8d8b88ea25ebc4b195e055b7779c42d5aeb8be3ce878031c0e16912e75755eeaa5c37366c6304dd180 SHA512 b94a8124fae8c073c4dfa2e8d629b547077d6d09eb9e7cf17faa038274125b17fe217b065e5c5ec78087abbdfea1219c3d45bbbc30e3fd2ebbe60c3e53cd3d81
diff --git a/dev-haskell/snap-server/snap-server-1.0.1.1.ebuild b/dev-haskell/snap-server/snap-server-1.0.1.1.ebuild
deleted file mode 100644
index d5722fa906b6..000000000000
--- a/dev-haskell/snap-server/snap-server-1.0.1.1.ebuild
+++ /dev/null
@@ -1,70 +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 test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A web server for the Snap Framework"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-pong debug openssl portable"
-
-RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/clock-0.7.1:=[profile?] <dev-haskell/clock-0.8:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?]
-	>=dev-haskell/io-streams-haproxy-1.0:=[profile?] <dev-haskell/io-streams-haproxy-1.1:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/snap-core-1.0:=[profile?] <dev-haskell/snap-core-1.1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	openssl? ( >=dev-haskell/hsopenssl-0.10.4:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?]
-			>=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/base16-bytestring-0.1 <dev-haskell/base16-bytestring-0.2
-		>=dev-haskell/http-common-0.7 <dev-haskell/http-common-0.9
-		>=dev-haskell/http-streams-0.7 <dev-haskell/http-streams-0.9
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/monad-control-1.0 <dev-haskell/monad-control-1.1
-		>=dev-haskell/parallel-3 <dev-haskell/parallel-4
-		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
-		>=dev-haskell/random-1.0 <dev-haskell/random-1.2
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/threads-0.5 <dev-haskell/threads-0.6
-		>=dev-haskell/transformers-0.3 <dev-haskell/transformers-0.6 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory                           >= 1.0      && < 1.3' 'directory                           >= 1.0' \
-		'directory                           >= 1.1      && < 1.3' 'directory                           >= 1.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag build-pong build-pong) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag openssl openssl) \
-		$(cabal_flag portable portable)
-}
diff --git a/dev-haskell/stm-chans/Manifest b/dev-haskell/stm-chans/Manifest
index fbbb845b5e57..349677f329fb 100644
--- a/dev-haskell/stm-chans/Manifest
+++ b/dev-haskell/stm-chans/Manifest
@@ -1,3 +1,3 @@
 DIST stm-chans-3.0.0.4.tar.gz 9673 BLAKE2B ecde49051b1849a357bfd1886e6075255ebcf1a72716b82740383725e370a66a516e1c16fca8acdfe1a1c9180b3553497c798a0bb1167def1b4cd5396b2d26b2 SHA512 7882fa4d036dc3de3dfbfcb62fd54eef5bf679d2adcbdc0653a1cd4c4f1b715dab6a70465573721b141cb9a281f2d6119114445c0dc79c5e4c474250f4f22d18
-EBUILD stm-chans-3.0.0.4.ebuild 565 BLAKE2B 4e9a089015f8c34665e15bc4858aa540eb51b1f61238b6d9649b46b97155acee7075ee442c6720a5db782a5c528f8a18b79d528a499e1879c559664893f3f9b3 SHA512 af79b553dce5173e604d0cefa58fd8fa5487ba4e6ae69b03c2838ab4a2dc640fde1c4df5284e6418892aad591f5ddb2bee48317074b282ae76c785d55e4e9f53
+EBUILD stm-chans-3.0.0.4.ebuild 565 BLAKE2B dcaa0a58f4bb9da66b4b1721152086f45a5309a8ef092eccb864c47b6bd86e3e9c9b9909c936414f3a591ad87de050041942a6753f70f7a1db63533f57d1e878 SHA512 909f36ddca994c8bf74c76e790f87aa46ca78d398d41512988c0a23ad47a197cf141f4fcb965869ddb9c7fbcf8a7191195c92689ec6a0ace50974b92cf18cb06
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild b/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild
index 87ed362b9e61..e7aaf5b34209 100644
--- a/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild
+++ b/dev-haskell/stm-chans/stm-chans-3.0.0.4.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.5.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/stream/Manifest b/dev-haskell/stream/Manifest
index 1a2231706678..1c2c7a26a743 100644
--- a/dev-haskell/stream/Manifest
+++ b/dev-haskell/stream/Manifest
@@ -1,3 +1,3 @@
 DIST Stream-0.4.7.2.tar.gz 6543 BLAKE2B 5e399aa6fc8fcdd0616d5349f5919f7b620d33651e12dfe8fbc9f9f3ad2d25021b369e7b0fa8a0d7bde1d68efd0fcc8a2b2f25a82fe49f93526eb6b7ac98329a SHA512 ff0b8c51d11cb4d4ed9d07af272bcf63fc4e4e1b4eaa76dce9c80234ba989c5690c41014e5e9bd3acc9faaea048a899f11d350459fc68d93c67f1e62e1fe6504
-EBUILD stream-0.4.7.2.ebuild 693 BLAKE2B bc826c75a4c580a6fda2463b65d6ac892d5157e8131d1723a59a305357dcf46f3975de48fea775547d35151f7412178061c85654391081ed2e9ceba08324e0e1 SHA512 025c7aa5e49b8c94a9e3e17249bc0205c5af92fb81a97692649abc4cef7d0db7ab8144386e4bdab33cfd25ee5671f6211271acec95a2c551b24c0a1149d73bb9
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
+EBUILD stream-0.4.7.2.ebuild 704 BLAKE2B 7eb931cf25adb12aed3f370fd18914482d624429e44eb442f48d49ae8efb06a4d7acf57bb9df4bf8dde02c2e1b7d5e25fbaac5bd39676f1d78148e165ee746ba SHA512 ddede3fda1a72919e3dac648bb193ad4932726be2abd3fc16a4b71dfd37a0403b887887357ddbf22dd3cbae828fee5324931eb36d56223673ab23b9c24891068
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/stream/metadata.xml b/dev-haskell/stream/metadata.xml
index 522384de8446..b7878815d80d 100644
--- a/dev-haskell/stream/metadata.xml
+++ b/dev-haskell/stream/metadata.xml
@@ -1,7 +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>
-</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/stream/stream-0.4.7.2.ebuild b/dev-haskell/stream/stream-0.4.7.2.ebuild
index dae773845bad..722b5e401fbf 100644
--- a/dev-haskell/stream/stream-0.4.7.2.ebuild
+++ b/dev-haskell/stream/stream-0.4.7.2.ebuild
@@ -1,9 +1,9 @@
 # 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
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -25,7 +25,7 @@ RDEPEND=">=dev-haskell/lazysmallcheck-0.3:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	dev-haskell/cabal
+	>=dev-haskell/cabal-1.0
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/stringable/Manifest b/dev-haskell/stringable/Manifest
index 41b32e641bde..c8c7864cf7d6 100644
--- a/dev-haskell/stringable/Manifest
+++ b/dev-haskell/stringable/Manifest
@@ -1,3 +1,3 @@
 DIST stringable-0.1.3.tar.gz 2665 BLAKE2B c50780ce134872b3adf8adec6e3d5c80030033431330e5e76db87ae5aa15cd5897b5c7b39d8c9f3f88d138b94ff5f771ab3e1fff53730863e5e267b34891556c SHA512 f55ac3b1ef18ed9f219da7d7146d625e347d4bc6690e0daf1624692765f06950a3ef4b31a47cb519da519413b36baef2fa9074b04809ef81f9fd2aa7e5c9bfe1
-EBUILD stringable-0.1.3.ebuild 663 BLAKE2B c5839aaed295c5ea324a79fd1afa76dcb2ec3ccda93c42bf93356589c056ef99b941cc62169bd9a7e2f20a01b389f6f4986771927ee7eb60f7aa37bdd5282544 SHA512 43512367666a285667315bc50cae64a828a5cef5a9937031665b3dea167edc63c27a1d3fd6414d22a21eb4490190020cfb0c05b0cc24b0a25d799453d6876fae
-MISC metadata.xml 436 BLAKE2B d3043ef48370f849101db808c6ae6ba5296b6e20ab9777c32aece5f175d61fba25f9a0b97241788c8ca51d8bcaa25feee2023845fa2ab998c161efd36538e16a SHA512 83dc010dc26ee2cad5812646d73c71a03c3b6ca4b1a57206831df72f0569bfc2b857be74d4220f2b673f281daae868d5cc48b8e1a19c43370e37408a7d74632c
+EBUILD stringable-0.1.3.ebuild 665 BLAKE2B 6f189431357dd48b7f18a928910676ea95cb5cfb491ad00d700eb7a930cbd4f1fac5d1d7b6ba72e4c9a238faa4c2fe43f93a7b4e17bb826aa938b25d89afd184 SHA512 a6665a21b6973b3cc35e6a229e5c876a02161579813e5dba7db0e62e6de1a0dd845285bf1cf7f05a25d93d7e4a7e331d38096ec75caa94b4b4ad1e689dfdb8bd
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/stringable/metadata.xml b/dev-haskell/stringable/metadata.xml
index 6a22462afb29..b7878815d80d 100644
--- a/dev-haskell/stringable/metadata.xml
+++ b/dev-haskell/stringable/metadata.xml
@@ -5,9 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		'Data.Stringable' provides a type class with a set of functions for
-		converting to and from the most often used string-linke types in
-		Haskell.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/stringable/stringable-0.1.3.ebuild b/dev-haskell/stringable/stringable-0.1.3.ebuild
index 19ce797a1565..7249e98ce996 100644
--- a/dev-haskell/stringable/stringable-0.1.3.ebuild
+++ b/dev-haskell/stringable/stringable-0.1.3.ebuild
@@ -1,9 +1,9 @@
 # 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.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/stringprep/Manifest b/dev-haskell/stringprep/Manifest
index c567a44b4a68..7cb492a8fefc 100644
--- a/dev-haskell/stringprep/Manifest
+++ b/dev-haskell/stringprep/Manifest
@@ -1,3 +1,3 @@
 DIST stringprep-1.0.0.tar.gz 17166 BLAKE2B 14089c667d95f8e4e91450c9990832855857e1f617f1964688adae28c044e3a5668e686eaabdd64cf7eb5cf4b0522fccd33bd3ccc012afce6fc3a25aa0a0b6e5 SHA512 0b6fc990124ccf12fe9a604b0f27a5b99a3d3a5fab7e938390fa9130ed3713cf4a7a610c1ac3b9e8f6138eb7e06a94c23f6bd9be132d1350607fe5abd010ee33
-EBUILD stringprep-1.0.0.ebuild 743 BLAKE2B a36128f1f3fb3ed8697a05260760b60dc4a56849af8f72dde63503d63eb36b72d1e4547d5ec890d568d8c78e885cc25087f5226156a636600a7096ded2393963 SHA512 88d0dc08c4fe7776382ab47de070f56b284ac6dfb5e774f2f80e0ee33454c23c54977a7607cc56b82fad581da64fb8ad465770bdc299a477f9d4bcbee7c1f5e3
+EBUILD stringprep-1.0.0.ebuild 744 BLAKE2B 7ccb36837a146d1ed977abdc679b71d9986f1e1af484b000b2fec45ce8a1fd1530121614be78512bf39694f3b70a5050e7b675c89cbc4485c2a2ce37b09fa254 SHA512 4facab318c75910dba3f7775379be6fe0b64c6098f7e5ec9d1c1a8a3cea41e78d7a24e6bda14d498fe422c6523a015729a57bf19854d1a2c72cc63b359117b30
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/stringprep/stringprep-1.0.0.ebuild b/dev-haskell/stringprep/stringprep-1.0.0.ebuild
index a7c0eed41d39..c41536b96e89 100644
--- a/dev-haskell/stringprep/stringprep-1.0.0.ebuild
+++ b/dev-haskell/stringprep/stringprep-1.0.0.ebuild
@@ -1,14 +1,14 @@
 # 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.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
-DESCRIPTION="Implements the "StringPrep" algorithm"
+DESCRIPTION="Implements the \"StringPrep\" algorithm"
 HOMEPAGE="https://hackage.haskell.org/package/stringprep"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
@@ -19,7 +19,7 @@ IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.9:=[profile?]
 	>=dev-haskell/text-icu-0.6:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/system-posix-redirect/Manifest b/dev-haskell/system-posix-redirect/Manifest
index a2c9fed1f098..a0aa3e6651bc 100644
--- a/dev-haskell/system-posix-redirect/Manifest
+++ b/dev-haskell/system-posix-redirect/Manifest
@@ -1,3 +1,3 @@
 DIST system-posix-redirect-1.1.0.1.tar.gz 3581 BLAKE2B d93a0ec31e8ad900871469e501feccbd0094f5b8be7671f44282e26a7a2a72d7f8b74294af57d13d9658aa1fa6ec0e73e26e6e85d967254dc38ed462599edbdd SHA512 3a41668540ebff5ce706db331bb3c736895bd6a8fc11926884ff3e96622bb047c5b715468f4db81d0ac6acd15144ae9dbb71f087173244e29ba5b2a242f43c95
-EBUILD system-posix-redirect-1.1.0.1.ebuild 574 BLAKE2B fe3cbf62c27360dd2f20aabd825a7f2da60795e439efdca564ffa9e88983c1cafbe9764939ab3e631bafb2b8ebc5d979699010f1ee7886fb09bfc54011cae9f5 SHA512 c0842679275e1a21e769e756b223572d60504a743dd275e2c174ca445a5a4d3c92cbab0d64850d5b3868237e8ed34a5c9fa62cca797896bbf295d817646555ea
-MISC metadata.xml 837 BLAKE2B b1949e599f2f80f86e9fdd21ca4a816fdcc80d2150465060ac7b0def4ed6d1c153c4c36999ec7fe56768350db0a2a1a90e4f633bc950fa19182494c15d03008b SHA512 ec4e74a4e8925c76c71a2f9817838771c6c2080ce11b3324637c3b7ae54c8354508f3df9da043704d87057a9092da8f7173e065c021646d3b0ae8c4010874b84
+EBUILD system-posix-redirect-1.1.0.1.ebuild 576 BLAKE2B 6590777377f9ec3f8b48602b6b70deaec6b22691b83fce3650c3c88612e09d6dbe86e7bc01f14f78e4799b050b2d3b5992cb862c9c466b408de8f1c7bb846740 SHA512 8649839483c039ecaec5d55d16928febd4416c1198225a96a76fb2a9c742ee6079719a3093875b1d6b3d64f6174ca018b448edd3fefe7107b10a54bdc88a036f
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/system-posix-redirect/metadata.xml b/dev-haskell/system-posix-redirect/metadata.xml
index 01dac7da10fe..b7878815d80d 100644
--- a/dev-haskell/system-posix-redirect/metadata.xml
+++ b/dev-haskell/system-posix-redirect/metadata.xml
@@ -5,14 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Due to the design of POSIX, it is possible to temporarily overload the
-		file descriptors corresponding to stdout and stderr to point to an
-		arbitrary pipe. It is, however, tricky to get right. This module gets
-		it right, as far as such a terrible hack can be made right. It can be
-		used to make misbehaving third-party C libraries stop spewing to
-		standard output. Warning: the module author has concluded that due to
-		lack of portability, this module should not be used in any serious
-		sytem. But, for those who like living dangerously...
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild b/dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild
index d8aeab1a8c21..dd6cce1fc5e7 100644
--- a/dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild
+++ b/dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild
@@ -1,9 +1,9 @@
 # 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.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/tagshare/Manifest b/dev-haskell/tagshare/Manifest
index 87dab3cfcb4d..3dfcbc573e02 100644
--- a/dev-haskell/tagshare/Manifest
+++ b/dev-haskell/tagshare/Manifest
@@ -1,3 +1,3 @@
 DIST tagshare-0.0.tar.gz 2127 BLAKE2B f03fa580c08c45fe26f40cea2490f29a76e88f57d0af85c77c955b420476c28ea518e7ff873e9f8074993f103c5326de897b73fe575917c3b1d1877f65742586 SHA512 872592757bba6b21846888aeec1b36cc4f7c9cd602a299bb493763bd1c38d52d84419319a6761f5019e565081aceedc343cc1e52fcf5449a78e709da6164051f
-EBUILD tagshare-0.0.ebuild 609 BLAKE2B 83daa28e802e3f8e30cab001e9581fdb837995abd1cfdc63b689d207ae42d7ea58c0bd4b163db5238d6875058c50375c5bcf8cef8b96a5a8114400711ac62d49 SHA512 275b890d0ae44d9292e8148e7dacc412fae8de50e0b16f56adac63a36e20c75ed085cb761253d093b29d8e26b8cde7ed636f65f328d732f8f4fcee4d8da102d3
-MISC metadata.xml 553 BLAKE2B e86aadaf6b4df3772eb63c53ddd687aa57272354fbbb97df32659af47ed9218dbecdc056aacf20d39da48bbd662dd8ad2257929455068551659f264007e245d8 SHA512 e5b3d9a4b326520129f0a48553c8880eeea1ca5bfa8a43748222d2ac2ea9563d0d040d8e0785ff16e8f3aa7b65c1e86deaa7bd4c88b29df34cbedd2f04cae25d
+EBUILD tagshare-0.0.ebuild 609 BLAKE2B 6a077e7e928327c92a1a7b12d0ad2bc3c8c8d6076b1d747bee65916c90a0d8fd3ee2ca15813a49a75446e300540cfa4009a7736ab6f6f599470d7c8f8c321a37 SHA512 c6c4d288b4a79d41bfe5a10a802f68418750a3e07dd3ed06edca169ca4ba8c8ea7184554b417df19abf965631d6d53f427cf84e0780ee8bab720e638b5e885b3
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/tagshare/metadata.xml b/dev-haskell/tagshare/metadata.xml
index 5938819251da..b7878815d80d 100644
--- a/dev-haskell/tagshare/metadata.xml
+++ b/dev-haskell/tagshare/metadata.xml
@@ -5,13 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		TagShare supplies a monad for sharing values based on tags
-		and types. Each tag and type is bound to at most one value
-		in a dynamic map.
-		
-		The principal use of this package is to ensure that
-		constant class members or other overloaded values are
-		shared.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/tagshare/tagshare-0.0.ebuild b/dev-haskell/tagshare/tagshare-0.0.ebuild
index 0d5716ef946f..f981323a9ca2 100644
--- a/dev-haskell/tagshare/tagshare-0.0.ebuild
+++ b/dev-haskell/tagshare/tagshare-0.0.ebuild
@@ -1,9 +1,9 @@
 # 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.3.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,8 +17,9 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/mtl-1:=[profile?]
-		<dev-haskell/mtl-3:=[profile?]
-		>=dev-lang/ghc-7.4.2:="
+RDEPEND=">=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
+	>=dev-haskell/cabal-1.2
+"
diff --git a/dev-haskell/tasty-kat/Manifest b/dev-haskell/tasty-kat/Manifest
index cf801a88a194..a76cd500e508 100644
--- a/dev-haskell/tasty-kat/Manifest
+++ b/dev-haskell/tasty-kat/Manifest
@@ -1,3 +1,3 @@
 DIST tasty-kat-0.0.3.tar.gz 6167 BLAKE2B 9ce1e0bfbaabfcbc7757b4b3512be83275d2662d060fe31e9fb4321d6dbac21237822e667b66bdae7126b188cda28a09726883dad349ab810b6129fa8c0c086d SHA512 3a695aaf2cd8d699dd07a58298ef9da12cdc3b56564d5202ec480b6ce099c394fbd7dbe3bbb0664b295d5a4ef6e65ec0a39f0b9479257e87356f67897922c287
-EBUILD tasty-kat-0.0.3.ebuild 668 BLAKE2B 705b7549d1ed2156010e2e43349e96dd71cbfbbe837c100cfa15ebb2ea66ec56d2a102bebb109690d433976f2b99df4e98fdf2eaed33e4381dec26d9389f8ad4 SHA512 4ba21fce22933786a44ad9aec1d9cc7a9baf201018400589e538f4d2fe4c3c4b986a480d1923fde9651b7738782e39fb229a84c9920d39b71e675db0970dfb4a
-MISC metadata.xml 333 BLAKE2B a8237e65beed9ad5f8c1fb2cafd87bff76a5d6d08d7ce4e394ee2bc8e2b5993ba4667f822d5359f76187f288d1e63834ef0415c310f3dc604f8af62b67f8a795 SHA512 dc3cb1135f4f692f747f7a9876cce209abcb6242fb764a3f8b2aadfb38a82a681a6ac673ca09c016676cb3302e548cbf2690a45445d09f7a8b1bf39b393e2958
+EBUILD tasty-kat-0.0.3.ebuild 673 BLAKE2B a5bd78b72eff0740cf56c9cff36f4465b3ddb603fdc5f93da16ac024f366b0614b93b8ebc07484f1953cc26da1fa6df0e4c79ecc8386366fed59b84a745337af SHA512 c75f8de2c709e793bc69d8051132f6101d1c8c7b97907bb39b89fe2b0690014d0c8bc06d6c8648a56754fb554a9c5a9a3107721dc1c49823a2e62de0a1a2d12f
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/tasty-kat/metadata.xml b/dev-haskell/tasty-kat/metadata.xml
index 9fb7b98b74b3..b7878815d80d 100644
--- a/dev-haskell/tasty-kat/metadata.xml
+++ b/dev-haskell/tasty-kat/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">vincenthz/tasty-kat</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild b/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild
index cda78beb62e7..e7d6236527b9 100644
--- a/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild
+++ b/dev-haskell/tasty-kat/tasty-kat-0.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=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.3
+# 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/tasty-smallcheck/Manifest b/dev-haskell/tasty-smallcheck/Manifest
index cccbe5c5b5ab..0cbf5bbd3806 100644
--- a/dev-haskell/tasty-smallcheck/Manifest
+++ b/dev-haskell/tasty-smallcheck/Manifest
@@ -1,3 +1,3 @@
 DIST tasty-smallcheck-0.8.1.tar.gz 2690 BLAKE2B e6ccfca50577edc27da4d8f77041e5eeb80c28574a5d0d9cfa20154e557a9893242456a4875e72d616e70f477bf1b7c6a1911c7d3a863b71e8481ff387815a00 SHA512 26ed0d75559c2da2f4296af6e9b02f8d0a19043b0ef154674eb782703fcd3ad7f4863b7b07dbaae27440078b4b00a9272cd9d5da23089993018e933577be5893
-EBUILD tasty-smallcheck-0.8.1.ebuild 690 BLAKE2B fdbef077a9ba3cede5a9d690c174652a2b456fec505ec9930a92e9dd7718e57a8121fa337344a69e353ea06950f6afe9079d8bb5192cbfc7360333e2eda2c0e1 SHA512 04d38ab05dc176b983480e05cabb2004089418235ebde95288f748a6980efef1cf3f77d26e5323a0c32bb80941c856a5937673681c1b47fefb1621989bac8a6b
-MISC metadata.xml 329 BLAKE2B 4d7bd8474e181d80d656c26f6bef32cc64aafeeb0ea7b3a25a0e5b3a729ba367c19587b40655bc7e0cde4a0e6968427d55e158c39c5f9bbfa5230fcf62612e33 SHA512 b6e8f1129fed853f18d8ecc7a78b9ba54c2549bbe14866da40f3784fd66cd57c5c0316f8a2e0c37feca3d0680dec9d2951111f08e19dcf42dda8fc918058936f
+EBUILD tasty-smallcheck-0.8.1.ebuild 690 BLAKE2B 1627971a636b462e0ec31004a35ca2b8e9e882092aecbbe23b527055b173e68bfdd8add9ccd8cace09e59f1b4ad289897249205625d72ca1e6bef05b6567f415 SHA512 be995a9ede81915601e737470770e9b19d69a9631a2e8eff25b6fe734c88e79abe1118159c7949b4ce6f0e3dc423eea955243c23165b239427bcef4e51b2cfaa
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/tasty-smallcheck/metadata.xml b/dev-haskell/tasty-smallcheck/metadata.xml
index 12d35e39322b..b7878815d80d 100644
--- a/dev-haskell/tasty-smallcheck/metadata.xml
+++ b/dev-haskell/tasty-smallcheck/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">feuerbach/tasty</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild
index 973abb681765..28abaea31822 100644
--- a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild
+++ b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.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.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/tasty-th/Manifest b/dev-haskell/tasty-th/Manifest
index c8968de32677..c433054c5998 100644
--- a/dev-haskell/tasty-th/Manifest
+++ b/dev-haskell/tasty-th/Manifest
@@ -1,3 +1,3 @@
-DIST tasty-th-0.1.4.tar.gz 3016 BLAKE2B cab6b8734dd8664e760d901b05074c84469381c3cb1e4a793a505b2a973fb0c1d32471847ef1c39fab199c1a16de3351cd0d839b5ab78bcf96515233e09c6fcf SHA512 0bddde5ea5cc0ea8ba502b88ec52fe0d46d9c6bcd107e4e3b6bb675d930752df103308b61589ce3de3302c7ac40eed9911f803542262246a43a867beee942aa6
-EBUILD tasty-th-0.1.4.ebuild 574 BLAKE2B a6172ec71d37b5f25843be821a5e7be8be60bf379f7c4688538c10feaf92309dffb51a8f5123820fcc43fb3d6a1af6596e0fdc406739e3b04fe7e850e23e5580 SHA512 ec318c1edcf0d3db7a51d01ead15e2943a71e06bf094655d16d04b53e96fd189c8d5a9b258a8dfbc6e2acb4ec6b1adac28469706875982957419c8df6920e180
+DIST tasty-th-0.1.7.tar.gz 4467 BLAKE2B 62a79152f5655e70f046fab56bb735387e973b339ec551fbdd60195a35d8c24c2adb97766394bee3feae532f5179ad4a32f9ccb464f0d52ddad27542f778d96f SHA512 7302220ab27aaed22e064518e915610fd5dc7033a931f862fbc63e8a0b1cadcf9306ab3d54d48a10a200c8c8a62b9259462f513a6350df5a02836c6a29f51aef
+EBUILD tasty-th-0.1.7.ebuild 671 BLAKE2B e0d5eaf747892c4feb935e00c48ef03ff18e3da20a519cd598f9af97e4646148966b9787d208e5fed543187c7c20942dfd51fedc90fbd98fb3060f19ec308879 SHA512 d79f1a6e3edc16ceab6de7ee4cdc6f6f79565419b5e98f71ff5b70148100526ff4e4bf576c58e74a0858a48e66734a4d69cc57ba5b13131adb174b8e4a04bd55
 MISC metadata.xml 330 BLAKE2B 6d5b5d58f125b73a62eb581fa6bcc80c877b8c4e6c2077ee6e11a351b39450ac589ffb43aa1bdf3ed9bb3c5830e032ec4640d3c9bf46829e5530d113c9a85a8c SHA512 bc229dab52896e44cc51d7a67a8fbaa2cc8842924245906513a10352be481e323db7214a4936a20476aa361490bb72447cd22ba270b6839d65ebbaaa77942850
diff --git a/dev-haskell/tasty-th/tasty-th-0.1.4.ebuild b/dev-haskell/tasty-th/tasty-th-0.1.7.ebuild
index 30f5e8d729d6..09b489a6e8e2 100644
--- a/dev-haskell/tasty-th/tasty-th-0.1.4.ebuild
+++ b/dev-haskell/tasty-th/tasty-th-0.1.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.4.7.9999
+# ebuild generated by hackport 0.5.4.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Automatic tasty test case discovery using TH"
@@ -17,9 +17,11 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-haskell/tasty:=[profile?]
+RDEPEND=">=dev-haskell/haskell-src-exts-1.18.0:=[profile?]
+	dev-haskell/tasty:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/tasty-hunit )
 "
diff --git a/dev-haskell/temporary-rc/Manifest b/dev-haskell/temporary-rc/Manifest
index aef8631c0a09..5940ac47cf30 100644
--- a/dev-haskell/temporary-rc/Manifest
+++ b/dev-haskell/temporary-rc/Manifest
@@ -1,3 +1,3 @@
 DIST temporary-rc-1.2.0.3.tar.gz 5285 BLAKE2B 4b0d956bb76914077e3124e539e24c49bb4ef1f47480857ab7bac98c1b296b5e9c467205bf32db9fb7a9ea2e975da66cc3e3786354eebef5009c9f49b2e105d5 SHA512 cb57b33403a69058fd2cfbb5f69bf6bbfe0d6b1baeeefcd67b4dcc68c2c6325d0ddc1d68e672509ca7f83fea6b56332d535b7ba4bd607b058070e89c8b0c88fe
-EBUILD temporary-rc-1.2.0.3.ebuild 663 BLAKE2B 4b1abb1863b6c0e89260b2094d0bae4c3bfc60827e0de38866d0e35a49a4b9deba45527c4913bc5d86c13632d03a92e9899ae770dd9d4a335e1a5f12a5c4bfc3 SHA512 f188f74a1fafba16b65a1f3ce9b548ff7707eda547dc102f13e58eb1a40f2fd4427c7d8f873b0b578d2b48bc72ef257468ca588d61ad183266222ad9c4f5547b
-MISC metadata.xml 818 BLAKE2B 169b92e2a4447b3275a3b1b650c40bfdfe834737cbe8b0a27ed25df1ff283b4d9b2924d0947e89a9f384637fb3b2bb0e4c1dc7446427f7885f6a43a7ea97623a SHA512 50f4e0737cf58194cbdd8f973eb9a3abbc76388105ef951707701c7b9753cfba074463db98b997f952bafa633161e8afc9679c48ec0317e217f7b7269b63d93e
+EBUILD temporary-rc-1.2.0.3.ebuild 615 BLAKE2B 774cefb6f36ec5791d82e4f2435f329e8e2b9e8943e2d0d0dceb8ea98e828e1f9166dd6b0e70099cf41bff148c5aa4e75945541d18f4c6a251a01a10c5f88c72 SHA512 222db64d74716593d4b030437f89bc855a05678167b45f68bd78f11e8763d229b7687c284addc07a612c558c2b098d1586791960f3dfde923e157c75bb15c94d
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/temporary-rc/metadata.xml b/dev-haskell/temporary-rc/metadata.xml
index bbe5b0a30e4e..b7878815d80d 100644
--- a/dev-haskell/temporary-rc/metadata.xml
+++ b/dev-haskell/temporary-rc/metadata.xml
@@ -1,18 +1,8 @@
-<?xml version='1.0' encoding='UTF-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>
-	<longdescription>
-		The functions for creating temporary files and directories in the base library are quite limited. The unixutils
-		package contains some good ones, but they aren't portable to Windows.
-		This library just repackages the Cabal implementations of its own temporary file and folder functions so that
-		you can use them without linking against Cabal or depending on it being installed.
-		This is a better maintained fork of the "temporary" package.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">feuerbach/temporary</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild b/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild
index 98648f12f2e5..b337eba34f42 100644
--- a/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild
+++ b/dev-haskell/temporary-rc/temporary-rc-1.2.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=5
+EAPI=7
 
-# ebuild generated by hackport 0.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -18,9 +18,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
+	>=dev-haskell/cabal-1.18.1.3
 "
diff --git a/dev-haskell/temporary/Manifest b/dev-haskell/temporary/Manifest
index 83c04ab745c8..61b15d817f2c 100644
--- a/dev-haskell/temporary/Manifest
+++ b/dev-haskell/temporary/Manifest
@@ -1,5 +1,3 @@
-DIST temporary-1.2.0.4.tar.gz 5347 BLAKE2B bf1d5740510248d993159aa4e1fba4c023efe1f64e8160c4a6ed33c2f8529907a406600c096f9ea0954f8f635955d2ba47968346f4c62eb3037f6748c862a9f7 SHA512 cc8ba1c43d3e75f13450cbbbea081b5dd42d4a8c0fd33dd4ca9cec636aa91c2cd5c6edbcd86bf7895d6672a46c3e2c8edc57bb2ce88f61fdc05ec75e62c9373f
 DIST temporary-1.3.tar.gz 5686 BLAKE2B 7769c471a8fe3f2a73291b53633c9d4ec785bff9dfa93874f46bdac50b7e16a5fea918848645132593d2d0c0aeda2479777e04b1adf8fa501306bace89fdfdcd SHA512 e3078caf54da95c4efa9e9c936b35a98b62296ecce2242cd4e103605a9d29e8a9d6c7027dbf50d02b6a893bea558ea5b07dbb1df7c59bf26d86db76ccf112f25
-EBUILD temporary-1.2.0.4.ebuild 685 BLAKE2B 3b1bfec7cecc0d3348a04504297fae4af2db87c685e73afd20b3b130cf5f1e3652c7b8356249807615677592026e991ad4f41f0bc5269b2a46d2fb0ca5f3dc8b SHA512 04eab66e2f429f7f3f32826c0b57642a3c44bb12dabb767f89a36ae389025b0d3f313db85c1485c99c2f151ba516b89ccef5c43e4356c6a9f7cec46bd7b7a8af
 EBUILD temporary-1.3.ebuild 743 BLAKE2B 2f7c476d29eaa306efdb8081690174c605d74e3aa5342373db323a830b84df0db4964fcdc2f4b712e01c7b7175ad98b4f5280bdd145daff157966685c0153b21 SHA512 a29378ea865e7f418fe9e9eaca715458a5e50646b4141048848093fec3ba387d205f204818ba614b425e8cb3e97b667053330d9939b78d4a3cee8a058d2cdc98
 MISC metadata.xml 760 BLAKE2B 657f8412b7add619d5d8827d13da1aebe29087a9334a6bb48271450138710c89e4227ff19f1348426531b3d189d750501ae343835ea9ec77d6e5a8b1e20b8a43 SHA512 bd5b25179a899cd867b1655df9e46e12d7a4a229edd3b1a13eab4688b6018757894be8c0a857231646e39260af604d762e8f7de5727d2366e20026908b3b3ed0
diff --git a/dev-haskell/temporary/temporary-1.2.0.4.ebuild b/dev-haskell/temporary/temporary-1.2.0.4.ebuild
deleted file mode 100644
index 4f76a17ee7cd..000000000000
--- a/dev-haskell/temporary/temporary-1.2.0.4.ebuild
+++ /dev/null
@@ -1,26 +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"
-inherit haskell-cabal
-
-DESCRIPTION="Portable temporary file and directory support for Windows and Unix"
-HOMEPAGE="http://www.github.com/feuerbach/temporary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/terminal-size/Manifest b/dev-haskell/terminal-size/Manifest
index 16ce884a2ff3..754aaac9d8b2 100644
--- a/dev-haskell/terminal-size/Manifest
+++ b/dev-haskell/terminal-size/Manifest
@@ -1,3 +1,3 @@
 DIST terminal-size-0.3.2.1.tar.gz 4175 BLAKE2B d6a2b54298217dfae26e3fccb5aca6813c23b1bdef5c2e22236b6285222ade53842acd0283e862c86f25f94c1b5ce9f990ad583e0f498b57795d6d59bafdd920 SHA512 1e04705dda8ade9a06f8b369f1033a93ffb94a1b959a556e11f2373b25924adbbab4be0f3e077394e1023e0054044739df13406b69153c1542f4083be82a1584
-EBUILD terminal-size-0.3.2.1.ebuild 550 BLAKE2B e6918661a2f51dfa84b00f4efedbeb22b86875963fc6f5a20e5f8763f8f59b8e9da7bcd43ca77a523996276a9bc16ea6ce9febc80b11dea6e3e66a7aae1e5559 SHA512 af386302f8190eb56da30d468969e55f613110c6bca1880fcd519aeb6dc6c1f53468af543de47d73a17181cb4f85f6f3e6c5bcfa1a4482e60a90b08b4d8a3a75
-MISC metadata.xml 400 BLAKE2B a5ab678a0634591a81cfcefd13ccc181a5b9e5b33a1151dc4b5fc627d59bb8c5d1f06d1fbbf4cead0093d9910122139dd0e5e04e1e05715f97c334455566ddae SHA512 ea20f290a799f96d47da8d221c60faaa59ac2194c3d5e60c541d6d066ce9eee7860c02ca0cacb72b80f644bb2d90004be216883f2c5f5417fdb24f2ca026ae92
+EBUILD terminal-size-0.3.2.1.ebuild 550 BLAKE2B dd79a9bf784e8aa01cc8a12ae7975c9201818a6d329cfbe12081ec7f10b65671f7caa64c4582a7fdc70d942a517aa2d628f1c97bcab7c70a96389f4fdaff86e9 SHA512 5833c731db135b99d49b9e915890679431eedeaa5a0e30f8788fea9ff82fd6b0e47a8701a2dce16d3315a5e50ed93dd0282e24bc2e326875285506ab54398b41
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/terminal-size/metadata.xml b/dev-haskell/terminal-size/metadata.xml
index 079464cfab42..b7878815d80d 100644
--- a/dev-haskell/terminal-size/metadata.xml
+++ b/dev-haskell/terminal-size/metadata.xml
@@ -5,9 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Get terminal window height and width without ncurses dependency
-		
-		Only tested to work on GNU/Linux systems
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild b/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild
index f9d8d31768b3..f525f392145e 100644
--- a/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild
+++ b/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild
@@ -1,9 +1,9 @@
 # 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.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/terminfo/Manifest b/dev-haskell/terminfo/Manifest
index 10de5c6c96e0..207fd2e9d607 100644
--- a/dev-haskell/terminfo/Manifest
+++ b/dev-haskell/terminfo/Manifest
@@ -1,9 +1,3 @@
-DIST terminfo-0.4.0.0.tar.gz 45591 BLAKE2B 94986d3301b73458eb83daa99c6a45b631fb83bee2a38724f2ae76b466abe52569529744ffaad014035947358f34761f18c5d1a734f5f2375b80fcfc2b1c4a8b SHA512 ba52ddd60ef899ca0a696813d613d12964b5e73b6450f013f4545cafa1ccd99b6f86916f0d369b4562ece0fa3f9280a7bba8160363cbc6cae93cedc3992fbf70
-DIST terminfo-0.4.0.1.tar.gz 45615 BLAKE2B e763301621d9d55e250ac822b2dbf1a9b652d8f99a205de9e17572f99c3b576424bb555e00d26654ef0acdd06c4ac16ed9c5fb7c207f0eb5aea19325f51eedb5 SHA512 4b21621f4f7ebf656fbfd4278fa970d0211e2b66632b5251cdcd659a71df04294ba334ede97582b5b7f403e15552f3b6c4b5f0cb9ec6453aace502109eaeff46
-DIST terminfo-0.4.0.2.tar.gz 45511 BLAKE2B edf4fae3dc4d6550941f60c2e87bfd2a81757e54e4198cd39751a651b6a09671d5dc8e8199bc25c5a06ae5644d7c30a299cf3aaa1b6256850ea24f64002f038f SHA512 eda799218ee1b1a765d909e9723fbf7e2de33b2946fdaeb92141bbf056a20a66bebc4b72359d1f5bdd5d188a10a3701d73818cee65170e0660daccf8c295897e
 DIST terminfo-0.4.1.4.tar.gz 42234 BLAKE2B d20920290bb865982d3dac1647a7bad8d75dc7782db249286fa0fcd70ba1bf532da174bc0925f13c6870a2949c7d3b033656c13f5906f09000ba7d89ace4102e SHA512 3006b7c4a0628cb0f28cfb9af8172410a194ee9dc24e1bd121a94d5c5bfbba09ea0b232412eacc7f6705495511077a427ef2aeb7fff2af7cb80e25823aa1667c
-EBUILD terminfo-0.4.0.0.ebuild 634 BLAKE2B bb1949e723721e8a4eed4f461513b630ad3df5f9677478f861e50eebba272713e79c802c26e3dd9596212a1b3c1e7f2e9a901c6190c5aff9988638664225990e SHA512 d953d1fa92643350b150caeb67009fea1687a01583b3cfebe1536333a06e2c563f7fe6582356c8ea449bd14527d087a48bd8df6a3fc63ffa29921faf8449eb33
-EBUILD terminfo-0.4.0.1.ebuild 637 BLAKE2B 26b404beb1af9c863f4c48df1532ab3155fa156efcc86a7dfa8fc934bcfc50446644476232decca6a6965803e8e850568bb68434f1037ed4fa44d558edbe986c SHA512 5f3ce70c2778a67b0e649eb97988a8672e92b6bdaab7dc04ccf0365a4151797db676e5081b0f1812f6d1062eb6493b437c0a71352ced9a3b2dd835886006483a
-EBUILD terminfo-0.4.0.2.ebuild 700 BLAKE2B f536316fee6fa6ae3af26c9f586ae8894887e2eab25faa4f8fb12efc83d89eb0ffca5287fa3cd5429bdcf5864469010ae28281530956b26c92e575897eafd34e SHA512 32db890f89e37996221f1d62357469e0dd8f38285605e8f14e4df436554bc86963bae88cb17a04f15a7b2b2d8b5d56501a6d9450d05571d6a21cf004b01296a8
 EBUILD terminfo-0.4.1.4.ebuild 694 BLAKE2B 198803287f7a9f98a8b6ac40a54e4bf25b267326f00313dbdbd54a8e11baccbaf1fb29fec98ff048d4c063021457da1c0fb0012482862d983151e70aed55d04a SHA512 48556bde990cdf0dbab7a6e320e984036e6d0a30bb6e4dd4cce51543ab31726d15e4d2657e648e503abab8783e75769bd2ef245b77aa736b722a885417e78a87
 MISC metadata.xml 306 BLAKE2B d582705c23d944c9c5e719cd7e5bd3ec21d51c972a9a6d1745ce7ffe7be67a02cce445aceffe320deceb2a3bd14e259e0f5d0a106f320abb7c8ab8cb6479a3f1 SHA512 265a8a424b9ec088d8f4f0902c294e336b1265a1cb538bf7aca854055a88a2aa2a33c22843b4a98007ff84b6699be0d0e68d7b9e943462a673580f5afd39047b
diff --git a/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild b/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild
deleted file mode 100644
index 2174f08d3c56..000000000000
--- a/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild
+++ /dev/null
@@ -1,27 +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="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the terminfo library"
-HOMEPAGE="https://github.com/judah/terminfo"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.0.1:=
-	sys-libs/ncurses
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-"
-
-CABAL_CORE_LIB_GHC_PV="7.8.3 7.8.3.20141119 7.8.4"
diff --git a/dev-haskell/terminfo/terminfo-0.4.0.1.ebuild b/dev-haskell/terminfo/terminfo-0.4.0.1.ebuild
deleted file mode 100644
index b89f2a5e62a0..000000000000
--- a/dev-haskell/terminfo/terminfo-0.4.0.1.ebuild
+++ /dev/null
@@ -1,26 +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
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the terminfo library"
-HOMEPAGE="https://github.com/judah/terminfo"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.10.1 PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1 PM:7.10.3"
diff --git a/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild b/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild
deleted file mode 100644
index 0349e6b96492..000000000000
--- a/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild
+++ /dev/null
@@ -1,26 +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"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the terminfo library"
-HOMEPAGE="https://github.com/judah/terminfo"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.0.1_rc2 PM:8.0.1_rc3 PM:8.0.1_rc4 PM:8.0.1 PM:8.0.2_rc1 PM:8.0.2_rc2 PM:8.0.2 PM:9999"
diff --git a/dev-haskell/test-framework-hunit/Manifest b/dev-haskell/test-framework-hunit/Manifest
index 01b48d3bad9f..40d9ed168a7d 100644
--- a/dev-haskell/test-framework-hunit/Manifest
+++ b/dev-haskell/test-framework-hunit/Manifest
@@ -1,3 +1,3 @@
 DIST test-framework-hunit-0.3.0.2.tar.gz 2770 BLAKE2B 48d5d90f215a27402c77967e4656e99cf74740775a98b3fbbd6d3ecd90ec1dc8d31cf462df6f7ba2939b40dd524d5f13a4cde01ce0d03aeb2829726393ef39de SHA512 068ca4326935746769aa4023076e9bd85d1753073c6e67d88daa6ccf2a69f3bafb87c3b03fd5ada612f6ddbdf2447b06ef8f853675cf0efe9eafd80606c40e32
-EBUILD test-framework-hunit-0.3.0.2-r1.ebuild 926 BLAKE2B c0a22dcb85c49c7dff6ea982a575f0b66b1a0c7ab8585f669d980b6951b30400b542c25b1d1b4343693f975b917f951756bbd7cdf59a8569f0ced36415df821a SHA512 a57c6b442ed67d652e5766773f70a7350ac53384da51d910a948cecbae1fb0f1ac8d76261f9829fc61a89f4e6662ab862b50a37685a764593be0de77ab3c6984
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
+EBUILD test-framework-hunit-0.3.0.2-r1.ebuild 927 BLAKE2B 1da27c2b4bedef1e8b0357dc8291402f6b117114f50ad50b3fccd1fc113f721219222023343a6ba32e692db232bdfc97ff95fe75653a6a33cade08a4abeeb052 SHA512 3851c29b2dcb7278b98bdb08b2bdd7298b754ce346b46100f381c9df461d17510687a6e56c3a94b6cb4abff12f3685b88d2d85c3b8ecbf0174113010e40588e1
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/test-framework-hunit/metadata.xml b/dev-haskell/test-framework-hunit/metadata.xml
index 522384de8446..b7878815d80d 100644
--- a/dev-haskell/test-framework-hunit/metadata.xml
+++ b/dev-haskell/test-framework-hunit/metadata.xml
@@ -1,7 +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>
-</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild
index 4fe663a8a4a7..8f1588293af7 100644
--- a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild
+++ b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild
@@ -1,7 +1,7 @@
-# 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.6.9999
 #hackport: flags: +base4
@@ -28,9 +28,10 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	default
+
 	cabal_chdeps \
 		'HUnit >= 1.2 && < 1.4' 'HUnit >= 1.2'
-	default
 }
 
 src_configure() {
diff --git a/dev-haskell/test-framework-th/Manifest b/dev-haskell/test-framework-th/Manifest
index fbf4169b1167..0e0e799beda9 100644
--- a/dev-haskell/test-framework-th/Manifest
+++ b/dev-haskell/test-framework-th/Manifest
@@ -1,3 +1,3 @@
 DIST test-framework-th-0.2.4.tar.gz 2977 BLAKE2B f43f3f964eecfba401db1fb574ab9ef4bf9b575251a60f196ddd451c23f8c29ea44f90d441eae2f5d923d053061a247820fc0a399e59e1eb088ba31abf38ef44 SHA512 0e8b6898eb7bf481bafb0c9ff9caa615dbf768e538e26b15ab899c5c9a1ad6bd6ed76ef93cf9a823706046d41f49fbb0cbe660bf846e59a608a0e5d21e89686b
-EBUILD test-framework-th-0.2.4.ebuild 760 BLAKE2B d69427c8091d0aaa3515d1d07312dd73d83c3dfefba6f1f5dd57bb56ab3cda71a1113df62db8ba3952f7c24482e2f48f65097b3e7bf6e673935c83a18df8fe33 SHA512 91bc479abbd21808687604a083a45c5d49aae61b2aeed9f8f5d6c8f57fa048c759aed36847b8e421cee3325394ca487e869e623624bc750dfab88cbdefe9a640
-MISC metadata.xml 1980 BLAKE2B 5048d5716f585e4b30b73713b513fb44dac589fa4a9b13a96b659159e412c074d3877d201319a72798119f633b49389d9e1643afc3c9935f5970e685625e464f SHA512 6fa19ea53be7c7dc114c6bdc70b41cd0ebf60c7a25f36cd2035ef7225c1da11e5de7d08eaf1bf41df7d305db5be5f3a26aea089a6a117481fd361ed3d0a2701c
+EBUILD test-framework-th-0.2.4.ebuild 751 BLAKE2B 1ebd22db456c11fc4d6246c98447fefe662b0409a80aff25465931fe67dde5d8fa2d32801bae4dde8b3f1a80702d59ea3651337dd9ae358b0abc8ba2c2b4c6ec SHA512 c8f3652d0d31b4c9d66037049307eb26829cac9d3be118fdc03786d4d867b4feac8bd13180449a51de05aefd0c2b411070a066cafd18f44759326407897218b6
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/test-framework-th/metadata.xml b/dev-haskell/test-framework-th/metadata.xml
index a8fce2d224aa..b7878815d80d 100644
--- a/dev-haskell/test-framework-th/metadata.xml
+++ b/dev-haskell/test-framework-th/metadata.xml
@@ -5,53 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		@test-framework-th@ contains two interesting functions: @defaultMainGenerator@ and @testGroupGenerator@.
-		
-		@defaultMainGenerator@ will extract all functions beginning with case_ or prop_ in the module and put them in a testGroup.
-		
-		&gt; -- file SomeModule.hs
-		&gt; ( -# LANGUAGE TemplateHaskell #- )
-		&gt; module SomeModule where
-		&gt; import Test.Framework.TH
-		&gt; import Test.Framework
-		&gt; import Test.HUnit
-		&gt; import Test.Framework.Providers.HUnit
-		&gt; import Test.Framework.Providers.QuickCheck2
-		&gt;
-		&gt; -- observe this line!
-		&gt; main = $(defaultMainGenerator)
-		&gt; case_1 = do 1 @=? 1
-		&gt; case_2 = do 2 @=? 2
-		&gt; prop_reverse xs = reverse (reverse xs) == xs
-		&gt;    where types = xs::[Int]
-		
-		is the same as
-		
-		&gt; -- file SomeModule.hs
-		&gt; ( -# LANGUAGE TemplateHaskell #- )
-		&gt; module SomeModule where
-		&gt; import Test.Framework.TH
-		&gt; import Test.Framework
-		&gt; import Test.HUnit
-		&gt; import Test.Framework.Providers.HUnit
-		&gt; import Test.Framework.Providers.QuickCheck2
-		&gt;
-		&gt; -- observe this line!
-		&gt; main =
-		&gt;   defaultMain [
-		&gt;     testGroup "SomeModule" [ testCase "1" case_1, testCase "2" case_2, testProperty "reverse" prop_reverse]
-		&gt;     ]
-		&gt;
-		&gt; case_1 = do 1 @=? 1
-		&gt; case_2 = do 2 @=? 2
-		&gt; prop_reverse xs = reverse (reverse xs) == xs
-		&gt;    where types = xs::[Int]
-		
-		@testGroupGenerator@ is like @defaultMainGenerator@ but without @defaultMain@. It is useful if you need a function for the testgroup
-		(e.g. if you want to be able to call the testgroup from another module).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">finnsson/test-generator</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild b/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
index 812e3653792f..cc8dadb87ad8 100644
--- a/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
+++ b/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
@@ -1,14 +1,14 @@
-# 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.3.1.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="Automagically generate the HUnit and Quickcheck code using Template Haskell"
+DESCRIPTION="Automagically generate the HUnit and Quickcheck using Template Haskell"
 HOMEPAGE="https://github.com/finnsson/test-generator"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
@@ -18,9 +18,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/haskell-src-exts:=[profile?]
-		>=dev-haskell/language-haskell-extract-0.2:=[profile?]
-		dev-haskell/regex-posix:=[profile?]
-		dev-haskell/test-framework:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
+	>=dev-haskell/language-haskell-extract-0.2:=[profile?]
+	dev-haskell/regex-posix:=[profile?]
+	dev-haskell/test-framework:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/text-icu/Manifest b/dev-haskell/text-icu/Manifest
index 457f5b43ce6e..07231f085473 100644
--- a/dev-haskell/text-icu/Manifest
+++ b/dev-haskell/text-icu/Manifest
@@ -1,3 +1,3 @@
 DIST text-icu-0.7.0.1.tar.gz 45533 BLAKE2B 1eda34ad7a8bcaa26814cb4fdb864e67531aca5dc80ece9a71dd770022ec7729e7e2960729c707ab9b5d4e8ad3b112e50572d26a2f2a573ffd6f3c914a0b5545 SHA512 54551ce0d629bffcca32fc855bfcdf2e24282359ce3a32578a98de4f4ad15378fa7df98c59d73323549a2ac873b10a10202bda02f5be83fbe1ab945aac5e50a9
-EBUILD text-icu-0.7.0.1.ebuild 743 BLAKE2B 0c6ecf2717640d6e6d3a02eb89041764bf6e3185b0843d62f872f87c5b778920c44980368a9bee3b433077614690d642069042f8782c0d33efa7b1d7373eccd6 SHA512 9fdfa29d2601deac4dd9e14c557715cd879d15a11b33afcd456a92f27c640e5c1ccec39fac7d878468bcfdac92c738a1f1efc14bb0c0eaf98bef1d710ab98c1c
+EBUILD text-icu-0.7.0.1.ebuild 743 BLAKE2B e7ba5ac5fca288179ef458045e51f7fb30f22bac4a5f37ef01895494c34f0cf2d22a80dcfa86554d6f8a9ef24308aba1bfcb3eed925c43746418fb1fbc4c0429 SHA512 268e708bc7f09470dcaf3f665ba10b3ba8fc0690f0babf0c1008efbb03ca5c476b21bc791b37cba0af67cf6b9c9d7150dcc96b0ac744bb6e977e12c604cfaf81
 MISC metadata.xml 1375 BLAKE2B 598c2f18ecd8c76ae5b8de8f9bf78c75e4d185f49e2ca74425b7379240018fcbef5c390bcc23747c919855fa3be2357f7fe8c5367fe3d30aedb7510dbb789f9c SHA512 0ff41b1b72b3cc09947f6937b969a07e98c9d04bb0967cf4feb066c755ea1da415a6138099aff4550cc7423a02d1c5f95a16e865c2c127e3551a62521e05d79f
diff --git a/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild b/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild
index aa4d52eec2fb..9a2bbca610d0 100644
--- a/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild
+++ b/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild
@@ -1,7 +1,7 @@
 # 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.4.9999
 
diff --git a/dev-haskell/text-stream-decode/Manifest b/dev-haskell/text-stream-decode/Manifest
index ad8e4f8a721e..1941d9ccff0b 100644
--- a/dev-haskell/text-stream-decode/Manifest
+++ b/dev-haskell/text-stream-decode/Manifest
@@ -1,3 +1,3 @@
 DIST text-stream-decode-0.1.0.5.tar.gz 12335 BLAKE2B 68c52959743e76b167f968817f128ea6e8c7d91ed091a4a19e75e7965b4dfa9d6374b21e8e68d69ccab9db95e7c431bf5736494c3923d24a1d00ea796f7eced4 SHA512 9005cc7013f56809cb0a86fa57aa6bbe97936095d100e35d86ae7e9013e0bbcced3f5522da08f5fe76585fda1e8f55b364a1ad787f9c7c7be30fae6555083a5d
-EBUILD text-stream-decode-0.1.0.5.ebuild 743 BLAKE2B 66dd3435567edf627a391da4e740ac580e660b8739779812731457713e6c7511074554aafe503c450d3874115db3b79eeaa94a892f6fcff75e0340a750d2193f SHA512 34394a69ab9d1b2fc07161b185c9205f26e9733885cccf33a82a5c956b9985246fe4f45f58e8e18ea031c8f9a6a76b2570e537996f303ea79845f542fdda1e6b
-MISC metadata.xml 861 BLAKE2B 37da117b21a0d18222ba0f817b05a3385c8fdd1e5616a15eb420526b0308dad9405290399131d6eda747323cf9df3a6f6f287873ae1253cc5362d3b622393049 SHA512 9d1f9f82f3c3e75f81460cba8873f4204c5804635032a3ab3b094ecc2abc636deb2f0290fe95c6cff1177e445fa825e2a2ca23f0132e48f528c704ba5a775616
+EBUILD text-stream-decode-0.1.0.5.ebuild 742 BLAKE2B 73cfe02d3c9aca1bfb4a9fe3b2cfbdc3a9a8f8c70d0446ed8822b49730308c26e83b3eaab8f49e9dca6067a4f40ff058770e2ab163020e73426857d241458c81 SHA512 6869abd234b42d6e2cbc7e34bbb363e738774acfecb200b955d8947307446801e1418c53d01f619335bc6879097ed00cfbb9e9dac0c7d8d034e3d2a642464195
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/text-stream-decode/metadata.xml b/dev-haskell/text-stream-decode/metadata.xml
index 9b39024523a5..b7878815d80d 100644
--- a/dev-haskell/text-stream-decode/metadata.xml
+++ b/dev-haskell/text-stream-decode/metadata.xml
@@ -5,10 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The @text@ package provides high performance functions for decoding strict and lazy @ByteString@s into @Text@. However, these functions present two issues for streaming data libraries: they throw exceptions from pure code, and are not designed for incremental consumption. This library addresses both issues with a unified API for UTF-8, -16LE, -16BE, -32LE, and -32BE. It is intended for use by high level streaming data libraries, such as conduit, enumerator, iteratee, and pipes.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/text-stream-decode</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild b/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild
index 7cfa633e38e3..8470efcdb081 100644
--- a/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild
+++ b/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild
@@ -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.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: +text11
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest
index a33220d314c3..a123ffb4fdaf 100644
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@@ -1,15 +1,3 @@
-AUX text-1.1.1.3-deepseq-1.4.patch 1113 BLAKE2B a98e12d81af76e7e36292156023f2b8e7ebdf712db2a4307e9719b03cb858c85ea2c9ae9b7f77288e817701d0b7bbe539dbc026133c8b9c0948a7b9655230f65 SHA512 c2f194ff78318895e8f676d1c0600ed1473ad71ddb7a8bb73ec5c86fcad9cbe15888ad1b7d6fc0087fcf4797b97ce4027ae0e9cdd292a04b02d96419c87c78f4
-AUX text-1.2.2.0-integer-simple.patch 2310 BLAKE2B cfcf4642d9c2aa8d0303c91db10216406412f4e5a9bc994d7fbd65e73246b410f26b61892903a789155de56a2ea2b9cff91cea70553e6d3ecc4bafeb53264df3 SHA512 1eb170e1ebd3368853078e9e6830cebab4dd7734a6f473e11c12cb2aca8a1d9f1b1cc078098abe9b4f57ad35d309e74dc74014b70bdbb30e87877f67e327392f
-DIST text-0.11.3.1.tar.gz 126477 BLAKE2B 27c135a5815eeeabd5791e4f0a16cce12def262d427096d7656a8932d59c4fdab91a7b196951b917ff8bd731034d8015e75d8016be1f3f9300fd3d29511a7634 SHA512 78e9b795ebcb4e43be42b34c3f5829e0f5030d93cb6dad59ca2eb4c7df3a5e338f65dc9f90da7b752cf2b1c15e8d973a25293a6418a4abed6e0ddac9222fb3e6
-DIST text-1.1.1.3.tar.gz 138063 BLAKE2B 150151cd991c2e905d75087dde7b889850a5b51bb1d95838c1969dd851f64af5d8594c333d49e4e1fe269479d8e59bf17bca33ad64e7ff36fcf45f529354bd99 SHA512 bfa5301827c72cbb3346fdb485e10094326a7cac71e01bba700ca0344bd4069c5b16c590dd7c38ee85969be06a2d3fcd760b34ff6f98eef176e7e8c325739490
-DIST text-1.2.2.0.tar.gz 148894 BLAKE2B 9a3e2d72f38f10b9e1e021ad7cf5cf182657a32f98fe5889befe1bf9fbd8da5a2a1e405177805774fca911b57279e3db73cd7e0ee22315210cb3c0f728633ad7 SHA512 832b0430581a06cfdfa2a5c83fa2720e3f4825ee0aa9c6b12ff6ccd424a9e3a061c9ae7eeda48fe7a9f077c50e379abe2eee3fb05bdbdec4d38115b5e3695f20
-DIST text-1.2.2.1.tar.gz 149888 BLAKE2B 6ef907f42f89f0d1a0b109ef3f277cb3a653fae9564e35a772945f88eca64b3250d7db1d5124d73358046f6c729c0b7f345b4e747383f305af8a66f9f55acae1 SHA512 f0615f7614127d86dbfb3fba5dd1753af3d0774c46e11ee4a99d4510f73b59cf1bd8c73ca0387dba4fbcea3936aaaf0e92561cf6aab1a98d08fcad481d3795e4
-DIST text-1.2.3.1.tar.gz 157382 BLAKE2B 551012a6b7bfc1b1ad838f977d67981a35b9d13f1cd1b568ce0beed3583c50887cf1ceb1033fbeab215806c5a0d0c5ca39ce2f1aa20fd06365440c3324e8a6bc SHA512 643eb3306761c3e29e05dcd7d64abc505789cd00c60f7a4562e5747f63bcc0ae6f0cc54bb5ed92cc85dbf6406942bf40289baf30aca91bf92ac5215af5eddc98
 DIST text-1.2.4.0.tar.gz 171477 BLAKE2B 29bb6738f5c61e13b218cc57cb0c900fce25ecad190315aea4b0a92d5200e2d54aeeae26c8dfc88ddc74706549b820272fdb3877330c8e1e5bd119cac99deef3 SHA512 a4bd566c7d0aea1bfeacf27332e9cff3ad894e7eed9f826b7e4fc7fb85e272164d18a34a81c89dd1ea802951a80ec1d82000ebef05748d419ddfff792c4525e3
-EBUILD text-0.11.3.1.ebuild 913 BLAKE2B 72913362ae357dbd523bc25d363c08af6da0c18bbb503bf1331c44d172b4b5929858992b77da5163d6d8b641065cfd6a467e82b4271df1003618275e7ac84a2e SHA512 67df10009e37ed91a1da9482e054fb72b179df655dcee323d13660af7ae16d565e165c6b974947465c0ab2f75ba1e7e1e4d3c16f84a6eba8c4b519124d5641f1
-EBUILD text-1.1.1.3.ebuild 1057 BLAKE2B 686fcee48fa4ec23897d0b8031af43e349abd7030d014acf104d07b3d02f85c9b7d73289597c96d13b710349c0c649f321131bd73d1aef086b410d556d43a995 SHA512 9d8b4745e8846477784f727b682442eac0bf4c780fb9a7b2f19287639437737230472998666c6389790147e240493b50713fdc6843228288d65ae35b1cb3d72f
-EBUILD text-1.2.2.0.ebuild 1098 BLAKE2B 8c79bb9988cf3d578ebeb5a3554c2e08d17f55dbe928e1ff0dc7c2dc23bff100a78d61d9a341984b4ff274156add5681e72c7c35bf0867c393829bd9a23912c8 SHA512 8aa01225a7119e298547b36d8d8df555702396def19c6cee9a7004a8d35a3268f22b1e2abac30f6b69ca39f8519f1eeffd2196066054ccf30f63a64f66349165
-EBUILD text-1.2.2.1.ebuild 1017 BLAKE2B a097471ce203c6e16a82b2807808e4d6d583339a48ed710b7de4f5a1b3b6970329918b404365e84c3906d38eea17afe6872f0430d84a6703d782b35296cc8ee2 SHA512 5b543f6559626e02ba20c66d35ecbe94103148ff541e8032f89263290e6aaf33aaef74e51799536dafd05ced0c02aad86104da225dcb97d1c7be720cc76f4d06
-EBUILD text-1.2.3.1.ebuild 1089 BLAKE2B 319ec3faafa5bffa20281d4cd48a1897e8dd09f1f0e272677665a9986daaa5e7130649982bbb50c21f72d7360ffe2957e9f6d53e85990ba90c9e8d3ebdca2a52 SHA512 e98ba12aa0f535c8055ab234975b5a35f55b4482a66e9449b7ea016f8cc5718ce836f33a8b09f8ea34a2cc38197354fffc5786451af124fba9db8d129b9f0cff
 EBUILD text-1.2.4.0.ebuild 1033 BLAKE2B acc7136bdfef8283a754cba3fa4fcbc13be4875fc065fd0a936ac3702ff1001a0c6b4c8e2b1e3bddad7e8eca3a71492b8cbccd1e28b0e0f69e864b894b0c058e SHA512 adbe2cb8469fdc6d6cd8be101b4d4b0c56d077914fbc5933008adbf4f947fed12abb931f63fe4d62c66e9e4308260fc7ffb1bfa601a297cb13fa5226b962f277
-MISC metadata.xml 1581 BLAKE2B 104f716f948006fb03fdfca08393a442a26767588a86e5f98ca12cbe54157b9448720e096888b47e0d4f6fdf30491fd6a77e62176985571a045d86f22d0de31a SHA512 398b1ba4d7eb16bd1517cd446278b42f2f15196faad1a59b0d9b04fefc9a63ccef0e871c614561ac7f0db5a3807ea4bd6a4ee5082a1a6915d525cdaedb6752c0
+MISC metadata.xml 1508 BLAKE2B 08f6bc5bf71673da2d537c07ef01ca787dd260e71ec011cb9b8c6940e0e0e5cfeed035a6d61d16bf4ac51eb6d32cd15915e25e478fc9e31c97e1d27fbd959412 SHA512 39745c75fe908c51a4c5a0f67b62c6fe65b41cc783753ba3217481b78b2a76f76d227b800310e67bbe95697bdbfc5594d082c699104eef463740f2e0c9a83c66
diff --git a/dev-haskell/text/files/text-1.1.1.3-deepseq-1.4.patch b/dev-haskell/text/files/text-1.1.1.3-deepseq-1.4.patch
deleted file mode 100644
index 524ebac371ed..000000000000
--- a/dev-haskell/text/files/text-1.1.1.3-deepseq-1.4.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 4115e196bde073d5deaa3759807a8647f3f3c6fa
-Author: Herbert Valerio Riedel <hvr@gnu.org>
-Date:   Mon Nov 17 09:53:24 2014 +0100
-
-    Add support for `deepseq-1.4.0.0` (addresses #100)
-    
-    The default method implementation has changed in `deepseq-1.4.0.0`.
-    (see haskell/deepseq#1 for details). This simply sets the `rnf`
-    implementation explicitly to avoid relying on the default method's
-    semantics.
-
-diff --git a/Data/Text.hs b/Data/Text.hs
-index 3bd34a7..b826acd 100644
---- a/Data/Text.hs
-+++ b/Data/Text.hs
-@@ -199,7 +199,7 @@ import Prelude (Char, Bool(..), Int, Maybe(..), String,
-                 (&&), (||), (+), (-), (.), ($), ($!), (>>),
-                 not, return, otherwise, quot)
- #if defined(HAVE_DEEPSEQ)
--import Control.DeepSeq (NFData)
-+import Control.DeepSeq (NFData(rnf))
- #endif
- #if defined(ASSERTS)
- import Control.Exception (assert)
-@@ -346,7 +346,7 @@ instance Exts.IsList Text where
- #endif
- 
- #if defined(HAVE_DEEPSEQ)
--instance NFData Text
-+instance NFData Text where rnf !_ = ()
- #endif
- 
- -- | This instance preserves data abstraction at the cost of inefficiency.
diff --git a/dev-haskell/text/files/text-1.2.2.0-integer-simple.patch b/dev-haskell/text/files/text-1.2.2.0-integer-simple.patch
deleted file mode 100644
index 349fd79f8b37..000000000000
--- a/dev-haskell/text/files/text-1.2.2.0-integer-simple.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-https://bugs.gentoo.org/575120
-https://github.com/bos/text/issues/138
-
-commit 6c69034c81974b3fab9dba2993f22cc0a80f1b9e
-Author: Herbert Valerio Riedel <hvr@gnu.org>
-Date:   Sat Feb 13 12:44:20 2016 +0100
-
-    Revert "Rename integer-simple to integer-pure (gh-138)"
-    
-    This basically reverts commit b806d9491c740dfcbf172d2936f1eeb3b72d3492.
-    and therefore resolve #138
-
-diff --git a/Data/Text/Lazy/Builder/Int.hs b/Data/Text/Lazy/Builder/Int.hs
-index 6d26ecd..1cb0651 100644
---- a/Data/Text/Lazy/Builder/Int.hs
-+++ b/Data/Text/Lazy/Builder/Int.hs
-@@ -36,14 +36,14 @@ import Control.Monad.ST
- #ifdef  __GLASGOW_HASKELL__
- # if defined(INTEGER_GMP)
- import GHC.Integer.GMP.Internals (Integer(S#))
--# elif defined(INTEGER_PURE)
-+# elif defined(INTEGER_SIMPLE)
- import GHC.Integer
- # else
--# error "You need to use either GMP or integer-pure."
-+# error "You need to use either GMP or integer-simple."
- # endif
- #endif
- 
--#if defined(INTEGER_GMP) || defined(INTEGER_PURE)
-+#if defined(INTEGER_GMP) || defined(INTEGER_SIMPLE)
- # define PAIR(a,b) (# a,b #)
- #else
- # define PAIR(a,b) (a,b)
-diff --git a/text.cabal b/text.cabal
-index ffb92cf..5fa1be0 100644
---- a/text.cabal
-+++ b/text.cabal
-@@ -69,10 +69,10 @@ flag developer
-   default: False
-   manual: True
- 
--flag integer-pure
--  description: Use the pure-Haskell integer library instead of GMP
-+flag integer-simple
-+  description: Use the simple integer library instead of GMP
-   default: False
--  manual: True
-+  manual: False
- 
- library
-   c-sources:    cbits/cbits.c
-@@ -145,9 +145,9 @@ library
-     ghc-options: -Werror
-     cpp-options: -DASSERTS
- 
--  if flag(integer-pure)
--    cpp-options: -DINTEGER_PURE
--    build-depends: integer-pure >= 1.0
-+  if flag(integer-simple)
-+    cpp-options: -DINTEGER_SIMPLE
-+    build-depends: integer-simple >= 0.1 && < 0.5
-   else
-     cpp-options: -DINTEGER_GMP
-     build-depends: integer-gmp >= 0.2
-@@ -181,9 +181,9 @@ test-suite tests
-     test-framework-hunit >= 0.2,
-     test-framework-quickcheck2 >= 0.2
- 
--  if flag(integer-pure)
--    cpp-options: -DINTEGER_PURE
--    build-depends: integer-pure >= 0.1 && < 0.5
-+  if flag(integer-simple)
-+    cpp-options: -DINTEGER_SIMPLE
-+    build-depends: integer-simple >= 0.1 && < 0.5
-   else
-     cpp-options: -DINTEGER_GMP
-     build-depends: integer-gmp >= 0.2
diff --git a/dev-haskell/text/metadata.xml b/dev-haskell/text/metadata.xml
index 707e40e47f20..bbedad4dc30a 100644
--- a/dev-haskell/text/metadata.xml
+++ b/dev-haskell/text/metadata.xml
@@ -34,9 +34,6 @@
 		&lt;http://hackage.haskell.org/package/text-icu&gt;
 		
 	</longdescription>
-	<use>
-		<flag name="developer">operate in developer mode</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">bos/text</remote-id>
 	</upstream>
diff --git a/dev-haskell/text/text-0.11.3.1.ebuild b/dev-haskell/text/text-0.11.3.1.ebuild
deleted file mode 100644
index a4c523cde5ca..000000000000
--- a/dev-haskell/text/text-0.11.3.1.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
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/bos/text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="developer"
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hunit-1.2
-			>=dev-haskell/quickcheck-2.4
-			dev-haskell/random
-			>=dev-haskell/test-framework-0.4
-			>=dev-haskell/test-framework-hunit-0.2
-			>=dev-haskell/test-framework-quickcheck2-0.2
-		)"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag developer developer)
-}
diff --git a/dev-haskell/text/text-1.1.1.3.ebuild b/dev-haskell/text/text-1.1.1.3.ebuild
deleted file mode 100644
index 2a662dc2b6b5..000000000000
--- a/dev-haskell/text/text-1.1.1.3.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.6.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/bos/text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-RESTRICT="test" # quickcheck-2.7 is missing keywords due to new tf-random dep
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-#	test? ( >=dev-haskell/hunit-1.2
-#		>=dev-haskell/quickcheck-2.7
-#		dev-haskell/random
-#		>=dev-haskell/test-framework-0.4
-#		>=dev-haskell/test-framework-hunit-0.2
-#		>=dev-haskell/test-framework-quickcheck2-0.2 )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-deepseq-1.4.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/text/text-1.2.2.0.ebuild b/dev-haskell/text/text-1.2.2.0.ebuild
deleted file mode 100644
index c8fb1a9fc74a..000000000000
--- a/dev-haskell/text/text-1.2.2.0.ebuild
+++ /dev/null
@@ -1,44 +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
-#hackport: flags: -developer,-integer-pure
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/bos/text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # break cyclic dependencies
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/quickcheck-unicode
-		dev-haskell/random
-		>=dev-haskell/test-framework-0.4
-		>=dev-haskell/test-framework-hunit-0.2
-		>=dev-haskell/test-framework-quickcheck2-0.2 )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-integer-simple.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/text/text-1.2.2.1.ebuild b/dev-haskell/text/text-1.2.2.1.ebuild
deleted file mode 100644
index 5b0c55ef8dac..000000000000
--- a/dev-haskell/text/text-1.2.2.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.4.7.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/bos/text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # break cyclic dependencies
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/quickcheck-unicode
-		dev-haskell/random
-		>=dev-haskell/test-framework-0.4
-		>=dev-haskell/test-framework-hunit-0.2
-		>=dev-haskell/test-framework-quickcheck2-0.2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/text/text-1.2.3.1.ebuild b/dev-haskell/text/text-1.2.3.1.ebuild
deleted file mode 100644
index 9bc3d4248bb2..000000000000
--- a/dev-haskell/text/text-1.2.3.1.ebuild
+++ /dev/null
@@ -1,39 +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.5.6.9999
-#hackport: flags: -bytestring-builder,-developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # broken test-suite
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/haskell/text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.6
-#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-# break cyclic dependencies, test suite requires porting to >=QC-2.11
-RESTRICT=test
-
-RDEPEND=">=dev-lang/ghc-7.8.2:="
-
-DEPEND="${RDEPEND}
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:9999"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bytestring-builder \
-		--flag=-developer \
-		--flag=-integer-simple
-}
diff --git a/dev-haskell/tf-random/Manifest b/dev-haskell/tf-random/Manifest
index bd792fb06365..1018fb0d4691 100644
--- a/dev-haskell/tf-random/Manifest
+++ b/dev-haskell/tf-random/Manifest
@@ -1,3 +1,3 @@
 DIST tf-random-0.5.tar.gz 18483 BLAKE2B 5fba820aa028077a1cc65e3e27b7e580f834750beb2df6dffb2488890df7e95247804a7384f18f03bb1584f5f34637bbc079b9c2445af1c6c1e3378bf0735d77 SHA512 a766909571b4b37daaaaa9fa1aa9739bd2db8c32c0f64452fd7c3717f4578090e5227b763772858c6c311c5f366dd461421ffc3beb295455902fea1fb133deb7
-EBUILD tf-random-0.5.ebuild 657 BLAKE2B b083dc10fd02e9a67c4a3f4ee945b319aec777f4f473c1c5d297901b2fe63ffffa5786cb0cec1c8d44de0f26fa34ded67acd662e488dd720f02f983da40066c9 SHA512 10d93d5a0b1d72a0f9b38fedb14fb825b5690e93a335c9f66e906f986bd0212df99a949d8e00e3143b395dcf7cfb0793eae050938fc9005b6fde423d27db371d
+EBUILD tf-random-0.5.ebuild 657 BLAKE2B 02d1573a92b44248a0f6d87925dddf51a2378346670d7e1b89bd2a7ce3b34f0fd9fc3c9b465dbf812bc59c0d7b54b6fcc867b0e0f543c00a276eca44877a0695 SHA512 6aad0a38168d51624a7221f13994f32994fe2e24653adb700ea40a674685dadc01ff7277f98dad50c4c442b06c21d7ae0899bab2b6fe028cd8c89c9093001da6
 MISC metadata.xml 1762 BLAKE2B 831805d32a97a3ecd820c9a1122cec524b3eafb3be41142b0677219d7e541d4b47ed8b22dad9fc466cfae5e301c9b469604b8a3eeafd9a1906b25dd2b91b7081 SHA512 56185586f7239dcac266f54e781e431643a80011ea73d340ac1e0bf5dd3937610d2d5433189fd59eb3736e71d3b1eeabe1a4cef804ace1369beb10b35bc93c5d
diff --git a/dev-haskell/tf-random/tf-random-0.5.ebuild b/dev-haskell/tf-random/tf-random-0.5.ebuild
index f13b4354541d..74fa3f385e70 100644
--- a/dev-haskell/tf-random/tf-random-0.5.ebuild
+++ b/dev-haskell/tf-random/tf-random-0.5.ebuild
@@ -1,7 +1,7 @@
 # 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.9999
 
diff --git a/dev-haskell/thyme/Manifest b/dev-haskell/thyme/Manifest
index e6fcc591c8d9..fa0dba915256 100644
--- a/dev-haskell/thyme/Manifest
+++ b/dev-haskell/thyme/Manifest
@@ -1,3 +1,3 @@
 DIST thyme-0.3.5.5.tar.gz 37220 BLAKE2B 16c72f436d8587f5102458a9013f1244e223dd675e610cfb8216d95a2ff01ec1b90bacd23dd50440ac87f6a73e22b2580a0dd4c0da3ca2c336d8e521b31fe23f SHA512 2f8bb307a49e441b3fe2a0337a25ef9adc94d3fe2f04369759bbdfba9ee788568016e8e9ce6dde2ef1ba51c61f98621f4dd35b833cab1757b022bf43524174b5
-EBUILD thyme-0.3.5.5.ebuild 1348 BLAKE2B 25c9d14ece7c3c223d0003b9d11854971d174934b943c483d4782926d80d53ca92291ab5eebd95952d020a9959ded77abbf3b7908b4d1b881b6ccb16c55baf37 SHA512 b2e037ce7f68396bacf3fdee3f853077672b5a9d0a07764f8f02ba29617ff6caa6e8e4395aaafa0ae8112ab4825c742b6a9f5e2490bcc03a69dcb07f940017b0
+EBUILD thyme-0.3.5.5.ebuild 1343 BLAKE2B b44bc558dfb40b1aed2e5a01daa32f7873f86258b822f528e7e7b7b242622f67ca7e7951d521e0b4c7ad32917967c860865897ba8906d6a8938675903dd7be05 SHA512 8f848f2752c624ddb548d5ba0a72a4d7c0a710213bec55c25cfc64a8c041b08863cc08bcfef466c83f8d953b362fd567208cfebc648c2be31f5277fe92c1c2c3
 MISC metadata.xml 768 BLAKE2B 4a2c19070a42c59d074bee59efb4d5727a9556119e9d6f2ba0f1717e2099087fb1ad09b5a19023ed18abd6d233ece0b4b4514c346b80bad410f6dacf000d8391 SHA512 ef57041acbcd716294f3c1c5a120977170c415c4149966414e340817d75e99b80c1efdf37c841b323275d444ff4c824573bf4953d7d663e309d04414c95342e7
diff --git a/dev-haskell/thyme/thyme-0.3.5.5.ebuild b/dev-haskell/thyme/thyme-0.3.5.5.ebuild
index cb2b61f3a9eb..9232956d3bba 100644
--- a/dev-haskell/thyme/thyme-0.3.5.5.ebuild
+++ b/dev-haskell/thyme/thyme-0.3.5.5.ebuild
@@ -1,12 +1,12 @@
-# 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.4.9999
 #hackport: flags: -werror,-hlint
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: need update against QuickCheck-2.11
 inherit haskell-cabal
 
 DESCRIPTION="A faster time library"
@@ -35,7 +35,6 @@ RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/system-posix-redirect-1.1 )
 "
 
 src_configure() {
diff --git a/dev-haskell/transformers-compat/Manifest b/dev-haskell/transformers-compat/Manifest
index c9402828465d..d50157f21615 100644
--- a/dev-haskell/transformers-compat/Manifest
+++ b/dev-haskell/transformers-compat/Manifest
@@ -1,5 +1,5 @@
 DIST transformers-compat-0.5.1.4.tar.gz 18574 BLAKE2B e08bbb9b6104a9e46b17478b156d4e5b9198ab9e93ecc1e0faec4402a8b403b19ee517bb81a1f4c0d8633ff6a74ec59470d6a27a3c3df947ee25ce11312a84a0 SHA512 7e4ff75cdae7afbf640b3ddbfc0a260be8bb3b06cdb1be803bfd7cdb333d289919164923ab4fcde4b270883548cce115643f908410ed394aec67efa389d5aeb2
 DIST transformers-compat-0.6.5.tar.gz 40421 BLAKE2B c3d4b55bef310f717cdf2069a4d8b58cc38ea037bbd982f21c11ddbfd3175689f681fed615f30f7026e826e90a0ee6bee51e7448ad2468a084ed00ad6311a643 SHA512 86ce6e81baf4e71cc4ac854066543a8777628ae67182e8059e582754608b279a053f7f98a539ec5cc07e1771d8173a6de6ebe5df4eee2b4c41278734774c3958
-EBUILD transformers-compat-0.5.1.4.ebuild 929 BLAKE2B 2bb9b58f9ecce85a614ffbf16525044e2c442cd9d9e7fa109df5615bb620bd88c5fa822a53b69197559f5dae3fdbad6cc1fc9cc74a53aa397fea5a85e0bb6c56 SHA512 4a516eb5b49744874b717f996e04be9524d053318c6b8bd582dc602ea0830dbeb2d70eee58a89bbdf3bb7b5ab0a64871c94751571e4eb9525ad144bc66dbed2d
+EBUILD transformers-compat-0.5.1.4.ebuild 929 BLAKE2B f4a90457d4eb899f7be2d80906741bc8d98c0222cfe2895b6ccf37221f3c4c63af43933fa57c6fd2c38ebf94bcd0c6ac145c0c934f59e9e26e1814a49279d4f6 SHA512 4845e19b8b6591c2af5768ec3fe1b63ff4f7ee87914ca1924e94a12779e466f23db1c6d9082428bade694f8ec360b716fe28665068fd82d864f64a0347949e9c
 EBUILD transformers-compat-0.6.5.ebuild 1501 BLAKE2B 5edcdbbe10fd4e7f7373e91e5b52d0821b43b1e6f7cf30be8cdb8e5666ccb09423dc33a4e4d0aa5481e3cae26a10b87273d146e945abf84bb230c8d06f354ecd SHA512 145064625386656ba68628b032b32f6df0295c20f2c2aca45e8de08036d3f658077bfac69524a7a356ecd383c51fa08473394123c5ba7b309fce9ba85fdc52a0
 MISC metadata.xml 812 BLAKE2B 56376ba85c38bf223334fdd52801f7fbb19d14a451166e4315a803da2401a6f04b328f96fc822f101bd6cece987ff31e717e2f29d5497dade8edde5870c9bd5a SHA512 9b7109fa74ac8b60851cad5a47001754d00ca9faa93d00d579c7ee236dd313839f52212d2fc2bd561f0330a2277a726c54f2afdb2f601785041b5b107c099d1b
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
index 94ceada31a79..547747d38deb 100644
--- a/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
+++ b/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
@@ -1,7 +1,7 @@
-# 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.7.9999
 #hackport: flags: -two,+mtl
diff --git a/dev-haskell/transformers/Manifest b/dev-haskell/transformers/Manifest
index b77c7d7151d2..a5c0eb7c6d83 100644
--- a/dev-haskell/transformers/Manifest
+++ b/dev-haskell/transformers/Manifest
@@ -1,13 +1,3 @@
-DIST transformers-0.3.0.0.tar.gz 20087 BLAKE2B f299971fcd23e6e41a8386371370490601b8736b66168885b0369679e023222fa828a9b03870b2de815a453177eb872ff587ac1792fc8d7a49a1fe84faccc443 SHA512 aa444d01ea2296f9a94908872f167f383b0299768b8599b7f488c1d7499b027a90ffd1ef56e250b474d7c547e0acd94ae91b1cc80cdbd4943b5dca2770e2ab93
-DIST transformers-0.4.1.0.tar.gz 27287 BLAKE2B 77ed52e3a8f8b9e2511044da19f3cb59c5398c0c36c380fa08bcd307aa6d094189342a1aae91eceee89de26e2926af523546ab35217c648382ba5e42d94f178a SHA512 bf6561e63e9e0108aa34d946f7e8ff4eb3b9a5539779dd064d27406d05997f038570b93fbbdd4bf7a1bbe9144c042ad5b89648896821e8c6527c619d02b074c3
-DIST transformers-0.4.2.0.tar.gz 27866 BLAKE2B 3501ef6fd01852e19f1e410f2990b8060f61e2dde4fe6f2bc3850344a08d97644e8f5a554ae2d0d8c4248d87331aecf7d0f66330811deb4ba1546065fb032433 SHA512 8b508731cbcbb3221ad6afa17b8ddb9b47db29bafe0fc4ee654538e20c2a0551394e8c7591f3b0abc01e02eaec271f44056629f0fbf26fb077c4499af1d6debf
-DIST transformers-0.4.3.0.tar.gz 28632 BLAKE2B 92cabcb654bb11854a3bffbb1262f5cd62eda1aff447157086a61ebc451ebf2fddec53b6a2cc058174f24f0f0e32df671d3717e30a542c8dc90cb87e327d990c SHA512 c3ec0893ebba4fbd6087c3202e919552c4a9bff3350b5c0589e7ebb18751a515d98b8cac15b0a3252906ea72b5a0eb09b7fe88c8da88b09d6ce4fbf0f50b2780
-DIST transformers-0.5.2.0.tar.gz 34696 BLAKE2B 426a597c6a23358af72344b0809d9d6890ca8ec315344643853e2549efb47d80cf5008d99175b9352ac704c24a7fc02c4369901cd880190645e3fcd1a5213861 SHA512 4fcccab5cb3dce3430c64ff19705208a03ee993c872f7b2581b3c84d44a835f344f253d98cb371fbce4839b393eff67d95bf57e079fd75e347f1a37bc85c6c5b
 DIST transformers-0.5.6.2.tar.gz 42370 BLAKE2B 317c8f557e0e37503546323096a9e2c880dd9331708b80b3041d4caa325b1c863b147abb433c0cdc15b1650a7412cb8579d96a8f819a93223b8588bffb440d8d SHA512 f871a910a5c31af77a4b9711f01b5780b1f657bbce0fb37234c97b8245d8504c514950f9e8673a606405484ae175cdb84c0aee7a05df8712cea02299c652cdf8
-EBUILD transformers-0.3.0.0-r1.ebuild 694 BLAKE2B 185a30f14d69551afbfefb42b006940c1fed62462fbf4e7222b8a3b0ce2eb944d73494062a806e0f90267c4b70dc93502a0570dc9c7dd17b50e2ca2f7320b0ca SHA512 4f7da92359de107de206a1d407740bd3f4b0aeeff6446f8e2be789bb316fe9f6088861ba8c23bc00c955dca8638d87a59a7edd1e8a9bc4f1fda76d8627a33a7e
-EBUILD transformers-0.4.1.0.ebuild 615 BLAKE2B 3ddc3140188d91cb29fa8460566c4ff006f588d5c539e868f78971853a97c487d27f51bca6e25fa68b7dce6fb15b0c5bf32fcca8285d3559b1ff06d7e6b22bbb SHA512 09cb822a35bbbbe49dd7eb96a2cf377f8a9f2fa8f7c5f21e353e7559567e3b4a9909f143946c2de6525efb7093350e203b214cf917bae840dc16196cea17ebe7
-EBUILD transformers-0.4.2.0.ebuild 707 BLAKE2B 03ebfe2f7817d3e2d4bac0a79cadba57d7856dde7be4cd80b6ba93bd85288781498de41aa50f6d8c2550920f03882095646b9592762b441a1b7e04e50f04842e SHA512 1a0f292408792e19f3c77a0eac8b3d7e08feadec37d1db1a1e9b8b8aae183a52a2f6103c71486a433e8b8bf209737c52131172e63e822c4c22dadca66c02c8aa
-EBUILD transformers-0.4.3.0.ebuild 719 BLAKE2B 30f6085e45c9c251056894b31743ca95f0cb60dc2500080257e47e2a17caf473e68acad2f82d28306ea3ee94a10cfbb3641d0e5bcf26c69df1c40d1ff8d94e69 SHA512 64f0dc6d8a37f0c668a2729e244d023c46e72e8e1d2e3ec01b375f134162427ef57de3278828313ef20df884cfbf87edc564dce7cff2b67d8605acfab9b71a58
-EBUILD transformers-0.5.2.0.ebuild 735 BLAKE2B 96e3d4614c2461f2f6ce2fdcc49155b1b5db96950bdf678c7df1be30e29c04b763f3fdb2e49bb43bc3b757af3757932ad4d57be489dae20739511d718ee9d1dc SHA512 c4f8a4ca7f369514a9488dfb76d244dd66bb34bd1451ad60acca2e87db9eaec48dc821ddcf11abebf0c5672b7f004199a0a8cc1947371c9305eba5349f2c06b0
 EBUILD transformers-0.5.6.2.ebuild 801 BLAKE2B e800cdd6aa23882357d288194549deccb3896cfee4d0aa588445c1e1232b0e2aabb2a29cf815f7a676a2653b52a714f0989be0b23bed8bd07ce593e5b256d2e9 SHA512 92c888e9fe495b2424f1765110c907ad9b46a35a6bdd427572dc979e607a60bbbc8a098985e057640cc187e03c06e0f85a935addcebcecd95a8a112be4ea29c6
 MISC metadata.xml 877 BLAKE2B 0586dc1fc804e0bde37650495e3edcdc5a8725e34a0dbe9dec382438718c4fda1ee68f9bfe23e3467c8a86dea0b6483007d92648c51ae8339e0eebfd5a8c5725 SHA512 a010fb14b9affd54a82308f792aff1f28a5ed4bbe4f1ac8be99c4d4cbde84b78ad49c71d12979bd40fae84e19a429b93de50c64bb345ca188a16ee375f45ae84
diff --git a/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild b/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild
deleted file mode 100644
index c7d83e23eaaa..000000000000
--- a/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild
+++ /dev/null
@@ -1,24 +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="Concrete functor and monad transformers"
-HOMEPAGE="https://hackage.haskell.org/package/transformers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:= <dev-lang/ghc-7.10:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6"
-
-CABAL_CORE_LIB_GHC_PV="7.8.1 7.8.2 7.8.3 7.8.3.20141119 7.8.4"
diff --git a/dev-haskell/transformers/transformers-0.4.1.0.ebuild b/dev-haskell/transformers/transformers-0.4.1.0.ebuild
deleted file mode 100644
index eec16954b099..000000000000
--- a/dev-haskell/transformers/transformers-0.4.1.0.ebuild
+++ /dev/null
@@ -1,24 +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="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="https://hackage.haskell.org/package/transformers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/transformers/transformers-0.4.2.0.ebuild b/dev-haskell/transformers/transformers-0.4.2.0.ebuild
deleted file mode 100644
index 414ae03b2fb9..000000000000
--- a/dev-haskell/transformers/transformers-0.4.2.0.ebuild
+++ /dev/null
@@ -1,26 +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"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="https://hackage.haskell.org/package/transformers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.8.4-r1 PM:7.8.4-r2  PM:7.8.4-r3 PM:7.10.1_rc3 PM:7.10.1 7.11.2015*"
diff --git a/dev-haskell/transformers/transformers-0.4.3.0.ebuild b/dev-haskell/transformers/transformers-0.4.3.0.ebuild
deleted file mode 100644
index 08a8598a4077..000000000000
--- a/dev-haskell/transformers/transformers-0.4.3.0.ebuild
+++ /dev/null
@@ -1,26 +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"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="https://hackage.haskell.org/package/transformers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.8.4-r4 7.11.2015* PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1 PM:7.10.3_rc1 PM:7.10.3"
diff --git a/dev-haskell/transformers/transformers-0.5.2.0.ebuild b/dev-haskell/transformers/transformers-0.5.2.0.ebuild
deleted file mode 100644
index a02a4ea3db81..000000000000
--- a/dev-haskell/transformers/transformers-0.5.2.0.ebuild
+++ /dev/null
@@ -1,27 +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.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="https://hackage.haskell.org/package/transformers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-#keep in sync with ghc-8.0.2_rc2
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.0.1_rc3 PM:8.0.1_rc4 PM:8.0.1 PM:8.0.2_rc1 PM:8.0.2_rc2 PM:8.0.2 PM:9999"
diff --git a/dev-haskell/uniplate/Manifest b/dev-haskell/uniplate/Manifest
index d09c992e425d..714097edfef2 100644
--- a/dev-haskell/uniplate/Manifest
+++ b/dev-haskell/uniplate/Manifest
@@ -1,3 +1,3 @@
 DIST uniplate-1.6.12.tar.gz 30055 BLAKE2B 557c3eeb14c0b292d4e0325a711babec39a76829822aee07e38ee49f7a4c3f82e72e6231c00fad1c7831864a7df4a9e12b3e913b60fe0e227d651d39c73300af SHA512 049b07e8a57db7e44d91fc9c8dcfb5c49b78a692a730061763cb8bcc4fbc3ed1065bd7a4c337e3d344693df882a0718b6d3bb6a6ea1e7d520a36d252d7038b07
-EBUILD uniplate-1.6.12.ebuild 938 BLAKE2B 1b383160b90c8a8274ae3115c2778eb56cc4096c5e1af87933986d82244471429d26f48b42c1a9f4ff82f284153b634972423f44f9b8b83ac99d7586b029cb1b SHA512 b13b0d92b5066cb536ea72cb8e232cd29992da022b24fc987f558d6edd07e3a3e6c0cc80bcb51a254d5762bf8d33fa35c7c7f5341357bd10934c9e1da4689d4e
-MISC metadata.xml 1613 BLAKE2B 635834b68d6f154f689302e4713069a66dc6165e2f78c8d2dc5be80919db983be9fada67cfe6961321658130b8da8cee13300c72d9ce9a0c61ae91ce04e567d2 SHA512 d29dfda9d4b53863b51928c40ccf25a6082f150a054fe9da9d48cf462fdf181d90e1b19b19312b72421b68637c8593481beaedf1d28e95278bf567151948dad9
+EBUILD uniplate-1.6.12.ebuild 850 BLAKE2B 63fd1b5c1e47faa5cc0d15fa8fad4c8a378f375003f5e74a7b0d367b2700625269086ebf39987dad1a6d4a293198bc7a78ef69f871bd1d97e11084422b853bf2 SHA512 ae7c73c75a8fdcbbdf51523548f3a3f2dfb6d9af8b8e9ad5c088840af63872f6be97a241b85eea50eda25eb465e0aec271f0f4bd43872ca41581018bddbdb7ab
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/uniplate/metadata.xml b/dev-haskell/uniplate/metadata.xml
index fd8349c40e4b..b7878815d80d 100644
--- a/dev-haskell/uniplate/metadata.xml
+++ b/dev-haskell/uniplate/metadata.xml
@@ -5,34 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Uniplate is library for writing simple and concise generic operations.
-		Uniplate has similar goals to the original Scrap Your Boilerplate work,
-		but is substantially simpler and faster. The Uniplate manual is available at
-		&lt;http://community.haskell.org/~ndm/darcs/uniplate/uniplate.htm&gt;.
-		
-		To get started with Uniplate you should import one of the three following
-		modules:
-		
-		* "Data.Generics.Uniplate.Data" - to quickly start writing generic functions.
-		Most users should start by importing this module.
-		
-		* "Data.Generics.Uniplate.Direct" - a replacement for "Data.Generics.Uniplate.Data"
-		with substantially higher performance (around 5 times), but requires writing
-		instance declarations.
-		
-		* "Data.Generics.Uniplate.Operations" - definitions of all the operations defined
-		by Uniplate. Both the above two modules re-export this module.
-		
-		In addition, some users may want to make use of the following modules:
-		
-		* "Data.Generics.Uniplate.Zipper" - a zipper built on top of Uniplate instances.
-		
-		* "Data.Generics.SYB" - users transitioning from the Scrap Your Boilerplate library.
-		
-		* "Data.Generics.Compos" - users transitioning from the Compos library.
-		
-		* "Data.Generics.Uniplate.DataOnly" - users making use of both @Data@ and @Direct@
-		to avoid getting instance conflicts.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/uniplate/uniplate-1.6.12.ebuild b/dev-haskell/uniplate/uniplate-1.6.12.ebuild
index 27ad0ebbe345..fd0d4337b90d 100644
--- a/dev-haskell/uniplate/uniplate-1.6.12.ebuild
+++ b/dev-haskell/uniplate/uniplate-1.6.12.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.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: +separate_syb,+typeable_fingerprint
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
@@ -18,9 +18,9 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?]
 	dev-haskell/syb:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.1:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-haskell/uniqueid/Manifest b/dev-haskell/uniqueid/Manifest
index 2ea699ab3e76..f9cd16e4c336 100644
--- a/dev-haskell/uniqueid/Manifest
+++ b/dev-haskell/uniqueid/Manifest
@@ -1,4 +1,4 @@
 AUX uniqueid-0.1.1-ghc-7.8.patch 1383 BLAKE2B 92ea3035b38b4f86559fff85d346940cd9f2222e4ef2e922128b14051db2b48ac70531146289bcd7a526d8498ab6f9440f1a8a4b6e38d5b3a88353f80a4acdec SHA512 2cb2bc04bc8ee52279ec953ed1435411d4715dec009012d191bd07df4ccd334ca4a60be123d00bf9a74a8f9e94e01b2fcea0c0692fdcf77c7d7a0c5d7b0948e5
 DIST uniqueid-0.1.1.tar.gz 2779 BLAKE2B 73ad9af177f20575caaefb12261d58801a391bfcbaa6b8ef1596538fd7536ec8b6aa35997277a39454250bc779c4c6174b1b3e7853bad5cc21d9ed72764ce517 SHA512 4a1f753a320a5ddae8dd47c3e3729144cf28effaaa6f16a8cf13ad614e4aba3f720f82025f86d7c04ae5c28d03825b4d3442caa01cd534dfa05a70c6c9cadc68
-EBUILD uniqueid-0.1.1.ebuild 604 BLAKE2B 8e06084c0677c0e7b4635fa465a2fbb23219fa1c39a51479e374cda636d2db271db8557235153a28f20654cf32293ee245b357a738ab0f4806c2bc9fe848bd5f SHA512 8eb0dac3a2d4c5f63049bb24df2975c67580533c45b79670af1fa09a53192eafdf3cbfb18bd7c27afc9aaa36d2675c402f52b9fad35ae7917b9ab94947144369
+EBUILD uniqueid-0.1.1.ebuild 588 BLAKE2B d047f51f2e40ebe1483b7708e7c48ff9060f9022b8a9888c0ada3103a976fdbe8c98f4a35943f9317b91405fd91ff52df17b84ec83fac5745fab10987f125a33 SHA512 6a56a83d9ac2c410a80f0bd95572804ab720b368d1933e7d21b021374c8b33e3fc315855c2f374a85c656746d5b4863615747531ba1de3be7eda18b2963934bd
 MISC metadata.xml 628 BLAKE2B 57879a83e3a6279bde5c6061154b7c35f62ff4bb0e6272c8b3f31fde6fadcc5673c19dfd74e5220ea4e0f448b316f76feb4a0e1bfb594ca35d216ca4b86ea758 SHA512 1f422717c439530df37fcad80a491643d1f9754eb130acdff4991a1f0e98a87db6c43bea2eea5ad1837aefe251a492085730773aae68f2a3de9c7a48aaa43e83
diff --git a/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild b/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild
index 7bc6d5fbc8b2..45f27b3410da 100644
--- a/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild
+++ b/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild
@@ -1,7 +1,7 @@
-# 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.3.9999
 
@@ -21,6 +21,4 @@ RDEPEND=">=dev-lang/ghc-7.8.1:="
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.8.patch
-}
+PATCHES=("${FILESDIR}"/${P}-ghc-7.8.patch)
diff --git a/dev-haskell/unix-compat/Manifest b/dev-haskell/unix-compat/Manifest
index f60c6fe3b3f5..db2dba2d976e 100644
--- a/dev-haskell/unix-compat/Manifest
+++ b/dev-haskell/unix-compat/Manifest
@@ -1,6 +1,3 @@
-AUX unix-compat-0.4.2.0-majmin.patch 260 BLAKE2B 6246f3dcf751b4da4fa04dad98a116b8ca4b65560e37ee5b349c3a7142322c280c42a56202a9dce54963466cf740a36b1cb7e7e4296e883be80d014ea4e67bc1 SHA512 cbde5119d830ae94f8460b3d91fb58169f5955dc4b8d645fd62d7c37dc32dbe61174c84e572c991a4857497c4007e677225af5281d85abbd97fc4523d2e52ade
-DIST unix-compat-0.4.3.1.tar.gz 13152 BLAKE2B a2fc2d7ab23c0b26349181cfcfa98d864944c5347f7a8177fa467e8b963883c32c042dce3d36dfabd7008dda9efe632f7cf1edb6485178d8b2695ca8d73dc4a0 SHA512 ff6d7f52d1e0e21c3739831ae33b34b13815aadfce7f90efe2cfa10325b55aac982824d4cdaf112af03e8d51824d091d8781ff1caf529f02f8d251ada5c9e63b
 DIST unix-compat-0.5.2.tar.gz 13281 BLAKE2B 617e916badf79b76959ffcd542ad6fa1f1ea04c0bc741faace7614bc9e0fcae0cc34dabb06197fa8686dee26b0d890ee95d3f6e5f6258e543424a9d99498a0cf SHA512 0a0a98e03edb7c6ab4401a022c3e90f7598b24930cb22ba04711c3f57b8f87990c6669d5cda07196b61d36cb6e0fa8b281822fa99b199c3b78cfccd0bc3f70be
-EBUILD unix-compat-0.4.3.1.ebuild 705 BLAKE2B df1a9bb9902700866d447c551341a4b5a428ed07ba56c986ba0d2a2fba7b87688d1f2a35d020b9e616f5ff3cf4d3efc929ff7b43a5807f1ce23c8fe62c670739 SHA512 6f80bf292c9b0358c0cf60771bcd5b1ddb778894dbb5acabaa1ba76cff80a263e3d889c72fab4a231372168f46deec321e6655c40fba2ac777f13ee946fbdbdb
 EBUILD unix-compat-0.5.2.ebuild 630 BLAKE2B 74c8d07da523e801ea697e83d48355b76f8fa798cf7d5aa546d467e31d3650709f76c8a5569a9da5194fef6730af7f172a6075083dd76ee77d4ec72abe9b3647 SHA512 f850c9bb4845a7cbbd1838a8296c205da6d0fd773cfe0392bf467be9c2b8af3b014d3678b56f7ffcceff3cbf3a063ac963ac0528c593e6a896a48c5d933c551f
 MISC metadata.xml 650 BLAKE2B 99476ccce782fab6a1f6c8a571e49cbec4ed9f97738669a0654a567868a7d3106dd0d36c562bbb232dd2763ef4e5504fc56bfcb39fa1eb8dbe7d74d8843ff037 SHA512 7ffb0c501a229a3e3bf2d94f72d9c63ffd7b11033392a8fca8b90e180fd299f97902d5d601402754608654930f2611ec05a2e9df0622d3c2ad6dbfc2cc9435c1
diff --git a/dev-haskell/unix-compat/files/unix-compat-0.4.2.0-majmin.patch b/dev-haskell/unix-compat/files/unix-compat-0.4.2.0-majmin.patch
deleted file mode 100644
index 1a07b6883ad2..000000000000
--- a/dev-haskell/unix-compat/files/unix-compat-0.4.2.0-majmin.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/cbits/HsUnixCompat.c b/cbits/HsUnixCompat.c
-index 1f7f189..5de35f5 100644
---- a/cbits/HsUnixCompat.c
-+++ b/cbits/HsUnixCompat.c
-@@ -6,2 +6,4 @@
- 
-+#include <sys/sysmacros.h> /* TODO: glibc()-specific macro */
-+
- unsigned int unix_major(dev_t dev)
diff --git a/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild b/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild
deleted file mode 100644
index d21861e67138..000000000000
--- a/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild
+++ /dev/null
@@ -1,31 +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
-
-DESCRIPTION="Portable POSIX-compatibility layer"
-HOMEPAGE="https://github.com/jystic/unix-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="old-time"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.4.2.0-majmin.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag old-time old-time)
-}
diff --git a/dev-haskell/unix-time/Manifest b/dev-haskell/unix-time/Manifest
index 9aeb0c60e429..7caced487049 100644
--- a/dev-haskell/unix-time/Manifest
+++ b/dev-haskell/unix-time/Manifest
@@ -1,3 +1,3 @@
 DIST unix-time-0.4.7.tar.gz 52235 BLAKE2B ec885f79c7f2be3766528dca640e59709aa984f70523714614414f921a7c7808feed274b44bc33cf23d4acee49dc0d8e4e30e9016a372850dfa1695abf81f7d2 SHA512 a9e5b77cb9c93b9a20687406aaeeaff5277d05b95ee9d874f3e0292eca83574b2e842785e0a88f71be3e91610db228c68b5cec885c4b3ea15fc6ec1bb861c072
-EBUILD unix-time-0.4.7.ebuild 968 BLAKE2B 1c643774574a05cc8fff1784740cde290ccde85182bf491e874b2bd962334fd308d744fb8a46150276dbf3b5837b35aeae51fe2be5545151dc19a6c3541517ea SHA512 e8fedb9a382d5fe308287c6f1c2d702d289d24c3bdda8685142318cda44052e71b91a0b8dcba18ee6bb81a9c5c2deae824d59ec9a18e3c57f70c72e4d4abc5ab
+EBUILD unix-time-0.4.7.ebuild 967 BLAKE2B 5b4370d1e895c1eedcc660453613d2e8bffeb5ed2b108a0e1b6301c9c4b2ac818e4f02218f64017230d9cfb2dd8932502b6dd4f50c409ebdba36a70077bdab4b SHA512 1af90478348d7f630e969f9c914671abff74edec9867493d3038144f95a73b881ffb05644a2e41a31a56cd43fc2f1e2d4a1c9869b49f3f1c0f0cfab01a51336f
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/unix-time/unix-time-0.4.7.ebuild b/dev-haskell/unix-time/unix-time-0.4.7.ebuild
index 24d3966f929a..d5efb0ce3590 100644
--- a/dev-haskell/unix-time/unix-time-0.4.7.ebuild
+++ b/dev-haskell/unix-time/unix-time-0.4.7.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # QuickCheck finds counterxamples:
-#  test/UnixTimeSpec.hs:53:9: 
+#  test/UnixTimeSpec.hs:53:9:
 #  1) UnixTime, parseUnixTimeGMT & formatUnixTimeGMT, inverses the result (2)
 #       Falsifiable (after 1 test):
 #         UnixTime {utSeconds = 747130527, utMicroSeconds = 819438}
diff --git a/dev-haskell/unixutils/Manifest b/dev-haskell/unixutils/Manifest
index e3874b2c68d1..d6ae83034be3 100644
--- a/dev-haskell/unixutils/Manifest
+++ b/dev-haskell/unixutils/Manifest
@@ -1,3 +1,3 @@
 DIST Unixutils-1.54.1.tar.gz 12177 BLAKE2B d330150c36ac3cdfb3b9eea4a26109cb76a96207c5db40d306479696082fe2017e1ae3892fa06571af96ae5cd4c3204e56860ab204ad9192fc5160d18f663bc3 SHA512 b8395cf6778c18a2f36a45a927d24042fd144ab70c6c092e1be36b22c59bbd1f0151cbe703d9db98dc769eba41ca9eb89cf60e87f5a6bbb32d6b64ef97c45665
-EBUILD unixutils-1.54.1.ebuild 874 BLAKE2B 98a03b977c7f6994fd5feb2ac935bf62df8fb0189577a1a92cf2f924b2557034eac94ad7b20f8aeabf7fa0ad64faf21ccb1e5674c8878fdf3b28696613485e6e SHA512 c2e5b31c77577a7d7f3d0dc74fae270f07ce911de9891760fc570104bda43d2bc3361390dbb43d9961a3ce1da48b4486bbac300d08eb90cd15c788e6f823569e
-MISC metadata.xml 537 BLAKE2B 9bd4698a44bb3e48a14898703238c81dd41def7f9c9d14c27dead5f79cad407af6356f6e7e472f1266a600b9c303d581e2dd265cd64cde0587aabcdd9b63f96b SHA512 953beaf766eedd3e86783a772d39919d3abbd4ebeb7bfeb0f757f6ebedff74c48bdf67638a29dd0b2f9b7ec485369c497e253e4ebe45a0679840ba930ca9f20f
+EBUILD unixutils-1.54.1.ebuild 874 BLAKE2B b2f18abd9cebd2a975dd9122134ef475344607eb1cf2c619a55e197de5dd3897033f790d0d4e87885c1744aca932db9de1998ea6de4df13d3224c37577f791be SHA512 a48f6c9f90b4901d563c85de36a9fd77decbaa589756b7df1ce95fd7b59d324d05caf9fde2750a9147a941f6867ac634cb616161920ecedebb87717507a705cc
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/unixutils/metadata.xml b/dev-haskell/unixutils/metadata.xml
index 6d8b18715fc5..b7878815d80d 100644
--- a/dev-haskell/unixutils/metadata.xml
+++ b/dev-haskell/unixutils/metadata.xml
@@ -5,11 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A collection of useful and mildly useful functions that you might
-		expect to find in System.* which a heavy bias towards Unix-type operating systems.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">seereason/haskell-unixutils.git</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/unixutils/unixutils-1.54.1.ebuild b/dev-haskell/unixutils/unixutils-1.54.1.ebuild
index 072b4333f783..118d852db460 100644
--- a/dev-haskell/unixutils/unixutils-1.54.1.ebuild
+++ b/dev-haskell/unixutils/unixutils-1.54.1.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.5.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/uri/Manifest b/dev-haskell/uri/Manifest
index d8f4b9ef1ac6..b136bbc9fa27 100644
--- a/dev-haskell/uri/Manifest
+++ b/dev-haskell/uri/Manifest
@@ -1,3 +1,3 @@
 DIST uri-0.1.6.4.tar.gz 5343 BLAKE2B b2c55a9d8313bafad3e2fa74ddb350ebbb548f59b1174d741f6120724994ec1cf164bcbc0c42492b8ff1c844f36b6c9c4fa3bd4d7f82c976574691c5ec9a3634 SHA512 0daa5e03fa7a3b767b4c523bd334017116432898d04c2b3250e1335ac217ed0f9b915785b200f6eb73127d349954b50dae6b5f979a5ba9f39d4d1ae2589c2a07
-EBUILD uri-0.1.6.4.ebuild 637 BLAKE2B 12db6585a10568c1a096839ec5040fbe03e12c8afa447391138442a416361241af233dd1d9e1bbaea73ebb12edb4730e04ef861553931124514ff6714a694160 SHA512 21db9b9bbea0312a3bd211f3c87928cdada7c9759ee85d9d83aa08de5977631eff822bfb709ae0c2b967118f1375c9eeef766f246569238e8f9fd0d3bc4b4d03
+EBUILD uri-0.1.6.4.ebuild 637 BLAKE2B 7c45154489498461abbf2741cc4e41a9e0ac00d0d5d03df887303237e6a27f3c997cd4d4b5e9005039370eb75d930d228a0c0c2c2c8026dedbc24642556b4924 SHA512 f5af29902df14f71dc2eca3884c5c08e70befaa46a8bde02a9c7efe7f044f57f6907b6d6ddab3acfb1fa68cb642744cdd5c44bf829b8d26f8b11cae32df88ab6
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/uri/uri-0.1.6.4.ebuild b/dev-haskell/uri/uri-0.1.6.4.ebuild
index ac482a0682ce..1b307db132a2 100644
--- a/dev-haskell/uri/uri-0.1.6.4.ebuild
+++ b/dev-haskell/uri/uri-0.1.6.4.ebuild
@@ -1,7 +1,7 @@
-# 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.6.9999
 
diff --git a/dev-haskell/url/Manifest b/dev-haskell/url/Manifest
index 2219772456a7..b51812a77145 100644
--- a/dev-haskell/url/Manifest
+++ b/dev-haskell/url/Manifest
@@ -1,3 +1,3 @@
 DIST url-2.1.3.tar.gz 4180 BLAKE2B 53dd6a8343cc394ea91b94d62d4dfcf0e8b5268c86058c8daf7a1de58e280eabea7fdb04a4b777bd853b5b35848df36aa67af5b1ae50ccc7a9b1149af41c33ce SHA512 53ee2aabc877c91d06c7e029ff807057f88bb4ce712ad02d47655d43869ad83af9032eea85d0ecddf3cad19839827bb723c9bf0a17b580ee7018f4b08c691cd8
-EBUILD url-2.1.3-r1.ebuild 621 BLAKE2B 9017bea274f5d18c03bb1aebd3749720125f5f3e6f470e22e6896f81ed1903af43bf72efbf073ddb0fd387e3e78da12542fa7c57d02d3a2f35c30f0b04d14603 SHA512 e7ae3010d7cdc02bf57400e558590cc688f9373240da37f22274036edcb948f51603ca97dd4e5f29f94b0f76de6bd801c5438291985fc35804e891816409f6f2
+EBUILD url-2.1.3-r1.ebuild 621 BLAKE2B 42c19bfb62c644e705d576f3b4528a96d7bf6f112b0d425c380e28153c535f5e2b637059a7f895abdfdfbfa29134563748e085e8912626bbe466c0c292efd7b9 SHA512 06fa3df427ed7a9e0efd5c6c7cc3ac22910e8b86fc4e075d043215d755db959949d9c03398276747b2450f577894f3dc26a766d4238a73019a057fd0fa3307c9
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/url/url-2.1.3-r1.ebuild b/dev-haskell/url/url-2.1.3-r1.ebuild
index 42aa72cf9c7f..4cba613ce057 100644
--- a/dev-haskell/url/url-2.1.3-r1.ebuild
+++ b/dev-haskell/url/url-2.1.3-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=7
 
 # ebuild generated by hackport 0.3.2.9999
 
diff --git a/dev-haskell/utf8-light/Manifest b/dev-haskell/utf8-light/Manifest
index fca906e19628..c1d3e3101492 100644
--- a/dev-haskell/utf8-light/Manifest
+++ b/dev-haskell/utf8-light/Manifest
@@ -1,3 +1,3 @@
 DIST utf8-light-0.4.2.tar.gz 5821 BLAKE2B 50f9ed9201458c90306200538e583f9a696f99aac394851da430dd69263789dccf9c4b188319bdbfeaec3542eccbbe7f4b336028953d513973b98718a4a22c18 SHA512 83777117a24a4c456134c0591e59ec010cbb938a5ddac8fc68b8204c7999aa2a36ab158b14e5b7bded1ca9cc4596f448b0e7aa5d194081130d7aef623d7c6bc0
-EBUILD utf8-light-0.4.2.ebuild 540 BLAKE2B 27f8d1504670e0e65ec676e751fc0c16349dfcbc7ec931219f91db35ddee1f524c673d58fd37e8269f5f3e456bf8aab4db1745c3b3d1159ab6edcd78cf1eb2c5 SHA512 aecdd344dd6ce500f2e8087d57ece2e47e986809ab1b31239cd9edcf2791d9a20e283d123b7d8e4bc7bb0bbf64a89f07635f9aa522f5d6c2b87235a0800818fa
+EBUILD utf8-light-0.4.2.ebuild 535 BLAKE2B 628387b4a5f312bdaacedc8e8fa7a421bb529100005b33a5699ee9e8c033872a804b3e8ba252fe01a4973b31592840f7c039c075503fb839a76208d33f8a9f65 SHA512 97e316c7ac2403e427c0b6299e88bd1280a884933f65087dc7b4868712ac7652535edce1972348d9b6689f387e307a09745f2a85e713e0534cc588d4841523bb
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild b/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
index 56a97c36c067..9a0c0ad3fbe8 100644
--- a/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
+++ b/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
@@ -1,9 +1,9 @@
 # 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.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,8 +17,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:=
+RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
+	>=dev-haskell/cabal-1.6
 "
diff --git a/dev-haskell/utf8-string/Manifest b/dev-haskell/utf8-string/Manifest
index a92f1324476f..6a7d3f3a7adc 100644
--- a/dev-haskell/utf8-string/Manifest
+++ b/dev-haskell/utf8-string/Manifest
@@ -1,5 +1,3 @@
-DIST utf8-string-0.3.8.tar.gz 9129 BLAKE2B 9ee624a9a1258b19134ac63e6b15fbb71a17e03e78be49c464c3c76eeaf2f052c65f8df360900a1e9badb31d7f27059aa33642e6244bd665e62519abe663065a SHA512 70f6ceaf4d9d6e6fe7b787facbb733f276ac5ba10c49c43e0da283b481f0579e0933f6343f5158973a6f0aac342f5b76258281dbd0c420bf652ad3c3787eb1fb
 DIST utf8-string-1.0.1.1.tar.gz 8667 BLAKE2B db2f899e0f78e44700cec859fd71982024e05f971ab5fef36071410c207a23dce1fa7430ce6cdeefdb5b2c28509eb5848946e2207e046ab7a4105c56e25fce16 SHA512 2dd647625478c9738b3af5e23e1e5ff92968449ad74e6d53dc308fa0f2b08b63c421a1cbe5491dd260b9b32770ec626843d320a09b80eb984211dba53934b965
-EBUILD utf8-string-0.3.8.ebuild 648 BLAKE2B dcf5e13b2b659be87d1fe7c5c74d59fce7cc1f326d39fb780266741d57d0a5cbb7ccd63338b064cdd0bdfe55e92737a39f712f3bb8e9217d977a19d79a1732d1 SHA512 d728abc6a715fa7cfb00c91a7d6ff4571e11e17d3715a66017c8ffa0087d0362d14f6411ffc75bd607a6ba70898096aee4da9a8523adc4fe3536b122593ee755
-EBUILD utf8-string-1.0.1.1.ebuild 665 BLAKE2B 057e4e97a8701be15b237cab41b141281966924adeb19e76de3c7ed1229e0b9f463f53c1fd7e1e9b0ebb93be03854e67dc039dbbf827b56b211b985c953f5802 SHA512 cab9c46ef87524a425c20ac4541d068323d79f7804c92b1a960225a7d4da0db37f69a4bf4632b4d1c6fee7b8df337e8308f274e68bb423d0d2780f06e1a9fa4b
+EBUILD utf8-string-1.0.1.1.ebuild 675 BLAKE2B 9235a7da9cb056d14ba790faf7aafa0f2b6bccc88be830644c36fcac330e888efabf9c8f960ce61d250523e3620481528a9789ab4904d92a7990520ea72621a4 SHA512 a24f890574b277b5b1f378a916f4368fc78d9e1f7ef4b6ff6716c51858ae8fc63e87e56fac38c86977eff1ad4de2a41c946f8a1fb7bde50fd9444b69c30308bc
 MISC metadata.xml 309 BLAKE2B 41ec5100a1fe355f798d48894322ecf00bc7802fac10222f95e96674335f9537e23f04c37bddc1e1cdec7728b33c3a6d3781dbaf2be464fc5643b0468e1ec4d8 SHA512 ce8b570dcd924d3409d3dd5c2d27601799b30ba8a166f502d262b66d02c63f5110bbcf92fb5ad5a610a68d4a97cd55a70bf5730d17a2a590a0df83d4e00c2deb
diff --git a/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild b/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
deleted file mode 100644
index ebc25d83c0cf..000000000000
--- a/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
+++ /dev/null
@@ -1,29 +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="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Support for reading and writing UTF8 Strings"
-HOMEPAGE="https://github.com/glguy/utf8-string/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 3 && < 4.8' 'base >= 3'
-}
diff --git a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
index 104a89bac444..3d4360870a3c 100644
--- a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
+++ b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
@@ -1,7 +1,7 @@
-# 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.6.9999
 
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	default
+
 	cabal_chdeps \
 		'base >= 4.3 && < 4.9' 'base >= 4.3'
 }
diff --git a/dev-haskell/uuagc-cabal/Manifest b/dev-haskell/uuagc-cabal/Manifest
index 143a20b7617b..eee239d173ad 100644
--- a/dev-haskell/uuagc-cabal/Manifest
+++ b/dev-haskell/uuagc-cabal/Manifest
@@ -1,3 +1,3 @@
-DIST uuagc-cabal-1.0.6.0.tar.gz 14781 BLAKE2B 8c68bf07e6e5e579cf59968e887728080c9c4233069bdc253402a8eae5e124d17bf52b3acd0e0a01e64e7d31bb948ff61c210c5afb4a64a3b449c8c302dcea00 SHA512 778edb1c5d209836b38de93ecde8fe9bf37e2b5ececfe5a6d9c92ddac01b1dc1ee865fe861bacb07617a317f2dc1d0a2a967aa9ec2682270e0bf58efb85c27a7
-EBUILD uuagc-cabal-1.0.6.0.ebuild 686 BLAKE2B f7ff5ae4055691b23c7931062839975fbfe5d20fa36d90a204759aa8a04da01c9bb27abf24c64fc2ac12f1613ab85f46ff9c076059d84b04509f12dac11a1eeb SHA512 85c5c2dd91936c2bafa3b5be9683c1690100f2bbc5c8d6bc350e35d4730335a8f9e29ee12850bfb0278ff0ec6d3a00e471a6b2855a8334e9176f23cd47c668c8
+DIST uuagc-cabal-1.2.0.0.tar.gz 15067 BLAKE2B 95951f1547d753c45ceafdfc7649bacc2cb069759342b7567da0fcacd868c635c4573f20f3cdba529bd4954514f865a4989fc0489dace118a0fd27c269f8e543 SHA512 7c5276b210ee24665ef76180e0e11a8535de2fdc65b15bd2c9e52923486736474e53cfb0350aa644776a1ba551100119cd4da6fb9a1da39b1953f04467c5bbf1
+EBUILD uuagc-cabal-1.2.0.0.ebuild 642 BLAKE2B 6005a89c887877aca033414a952b0f4ca93ef976779235688bde593acd39e950f461e79187666a4c4e11082af34c39e8c4bfb4886a0f4be3c6ed9955bd6c0b05 SHA512 74b2bd3bb334a97c31425eeac64a84aa1223f9d490e9f9882af1131c2184471a15fdc6c22122a907bc59b5d89af45e2443739abda1a6390c5fe6de1e981082fe
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/uuagc-cabal/uuagc-cabal-1.0.6.0.ebuild b/dev-haskell/uuagc-cabal/uuagc-cabal-1.2.0.0.ebuild
index 06e29a3ecab2..d0fe4cf79d30 100644
--- a/dev-haskell/uuagc-cabal/uuagc-cabal-1.0.6.0.ebuild
+++ b/dev-haskell/uuagc-cabal/uuagc-cabal-1.2.0.0.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.3.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="Cabal plugin for the Universiteit Utrecht Attribute Grammar System"
-HOMEPAGE="http://www.cs.uu.nl/wiki/HUT/WebHome"
+DESCRIPTION="Cabal plugin for UUAGC"
+HOMEPAGE="https://github.com/UU-ComputerScience/uuagc"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -17,11 +17,11 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/cabal-1.8.0.6:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?]
+RDEPEND=">=dev-haskell/cabal-2:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?]
 	>=dev-haskell/uulib-0.9.14:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-1.10
 "
diff --git a/dev-haskell/uuagc/Manifest b/dev-haskell/uuagc/Manifest
index 01a4f80af13a..35a17385be5d 100644
--- a/dev-haskell/uuagc/Manifest
+++ b/dev-haskell/uuagc/Manifest
@@ -1,3 +1,3 @@
-DIST uuagc-0.9.52.1.tar.gz 795294 BLAKE2B 58dddafabd99d4b2a2d1adde26691f419a07c1882619258c2e327066d20d16640c00bfdf124fc5d245a2c39fb719580e0c3ea3c35279fd2ba39c5bcef075d456 SHA512 f5de27bb06a9453f1d9f4105f10b98636c0bebf351f69f122c420efdcff3dc0c25cbc9a69c8a804b8618f2ff1cb216acea8119b333a130a30a840cc00b268c8c
-EBUILD uuagc-0.9.52.1.ebuild 939 BLAKE2B 56b64c24ff348fd642822524b5148a7eb425b136312a9c545282adac436e6190d469113ba74d2ab2a98fa28ca145ca2b0e8696a69c7ffd145ec34615c74bd49e SHA512 7d2c6a71b5e2d76156fbaa95ee71228d0862d3a867ff18708b7a9013f075a5ee17deadd58526cfe1f302b556902ee1301806cb260b0b010b9621fe9039e88551
-MISC metadata.xml 387 BLAKE2B 31ed565f6adea3e708b025ecd69f8d68885471744c1bffb4249ea6d3727b823682b56c40e9be37c07a23c4e2549cdc3852705c5c3b3a371a6f620b408f85f646 SHA512 8a4c033b0da5ccef3a9466cbf2e1d4829627f7a347f4b05850ed726f1cfbb1ddfce2743314a270e4971594a2331558a66339630eeb826fb5a1b35c12839a5550
+DIST uuagc-0.9.53.1.tar.gz 790766 BLAKE2B be50fcddc36599eae725034a8353d2a6617b5e79f6b7ce5afdff9b1ce9188d4a68509803aacb445feb1e54c9208ca8e58a3c3897d5189ba382248f2977eac9a5 SHA512 f751420d6d597b843775c2b5c49dfb4f3a2953d56204a2c36bab641ee45960628612e1d4f067880ef6c028d32959346dc0e1afe56fd4826a2af56b4e8e054476
+EBUILD uuagc-0.9.53.1.ebuild 925 BLAKE2B 3546a1550bbfaf13c36deb4a73c591586aec72bd63e517ae91fd4811f40de443e14c5d4092cad22377a630e4fd7ab22276ad037942885fee16dd3e87d5e2c409 SHA512 1332f6f121d43ce8ba114cd17a16bf59d9238b44554ee215648d314b938fd5eb80fce2302bb34204d7d2eb54f65ca7059cdf593650389f5625db3d9345d9edb9
+MISC metadata.xml 361 BLAKE2B 5953269d4935da3032111bc334cfce0e2ef0982920b3a3dac58d8e76e06ccfe70cf1a6fafa6acba22677cf8d03f2ea93d2b2022951bb995896151ae0ef47a8d4 SHA512 35782cebf31f22e32f2e126a91617a6f7b2bfb601b5b51c97bfa8a3ae8593e18ea50a0b6e7eaf1316aa56e5a4744031044be258f1dd1be42259f57aa68b4438e
diff --git a/dev-haskell/uuagc/metadata.xml b/dev-haskell/uuagc/metadata.xml
index 61e20f025c28..81f296ec4ed4 100644
--- a/dev-haskell/uuagc/metadata.xml
+++ b/dev-haskell/uuagc/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="with-loag">Use <pkg>dev-haskell/minisat</pkg> external SAT-solver to schedule all Linear Ordered AGs.</flag>
+		<flag name="loag">Use MiniSat as external SAT-solver to schedule all Linear Ordered AGs</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-haskell/uuagc/uuagc-0.9.52.1.ebuild b/dev-haskell/uuagc/uuagc-0.9.53.1.ebuild
index fa5fc260b726..5421f5bd39d5 100644
--- a/dev-haskell/uuagc/uuagc-0.9.52.1.ebuild
+++ b/dev-haskell/uuagc/uuagc-0.9.53.1.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.5.5.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: -bootstrap_external
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
@@ -16,21 +16,21 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="with-loag"
+IUSE="loag"
 
 RDEPEND=">=dev-haskell/haskell-src-exts-1.11.1:=[profile?]
 	>=dev-haskell/mtl-1.1.1.1:=[profile?]
 	>=dev-haskell/uuagc-cabal-1.0.2.0:=[profile?]
 	>=dev-haskell/uulib-0.9.14:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
-	with-loag? ( dev-haskell/minisat:=[profile?] )
+	loag? ( dev-haskell/minisat:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-1.10
 "
 
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-bootstrap_external \
-		$(cabal_flag with-loag with-loag)
+		$(cabal_flag loag with-loag)
 }
diff --git a/dev-haskell/uuid-types/Manifest b/dev-haskell/uuid-types/Manifest
index 4a8b911671f0..3046b95b79d9 100644
--- a/dev-haskell/uuid-types/Manifest
+++ b/dev-haskell/uuid-types/Manifest
@@ -1,3 +1,3 @@
 DIST uuid-types-1.0.3.tar.gz 11999 BLAKE2B 71941bf6abf554e2fa4fb64ae2cc5d61354643c07fe757920c19b60f762a7ffdce87c222d1f1a4a993b50f95e58ac4a011e2ae10c73108a6b71f65ebff209600 SHA512 039bccea9ee22388a50e3e233c95afdd3a59f01aa5f552dcd8e8c1ded8f9da210933c58a4d9cc0913c768b587c24ee27fa0eed15e531846ea841b666f513df9e
-EBUILD uuid-types-1.0.3-r1.ebuild 1356 BLAKE2B 6e00752dab44a91749d68c8dcfcd3ff3c47dfada7afadc10edfdab83c3ee8c6e0cf665275badfd60b318fce7852c802033b8f1d3d9ba1c6a3a55c1fe1f45cf4d SHA512 c9f6229d0ad7baa870796f4ad47ceaa5f864a381c0b759cde7aeff2671b6bad29bf3cbc383a2ca98da489a0f06949cfaa7d8788942600913754cbf6a778ae431
+EBUILD uuid-types-1.0.3-r1.ebuild 1356 BLAKE2B 7451633c6802fe88dd170909b55c747a8234cd8981bfef9d68ddd54029a3f11f6961a77fde1cf53200443a16f924d981e8d1409163aeb97e77806c9a79ca61a2 SHA512 b598cacc0d781efc0baec5d60102527430ca442fa60dda8d8800eee2d6d45624f1fe4f269a05fa27407e70abbcb23c4269fadf5e4eec07f21e2835c18c3ff5c4
 MISC metadata.xml 547 BLAKE2B d688b78a2d939de354f5691e59416d43eca488e1737cf2ea4dd577a9aa985e38bbfc464f5b3e1d5b586df990204b384897d34b0816c8b23877e43a70acfb81b7 SHA512 00ed619a88824b0a64195d255528cb6e4e2e6578feafdc2b6b2f38d1ff630f0469b2f16a922477cde922c9f7474ce6f16f6bb68e0350c7563e3671ddaaf64917
diff --git a/dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild b/dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild
index 4cae53fd3942..8df1fd9cf77c 100644
--- a/dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild
+++ b/dev-haskell/uuid-types/uuid-types-1.0.3-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=7
 
 # ebuild generated by hackport 0.4.7.9999
 
diff --git a/dev-haskell/vector/Manifest b/dev-haskell/vector/Manifest
index d879f10eb880..279f33f1dcde 100644
--- a/dev-haskell/vector/Manifest
+++ b/dev-haskell/vector/Manifest
@@ -1,8 +1,3 @@
-AUX vector-0.11.0.0-primitive-0.6.2.0.patch 753 BLAKE2B 1117ef087b476dc7a35bdf4286d980a9be438c71ab6d08f0219b03a714859ea30c444b983ec04b03e297a8100cca37c6f64f75167c55a002c8767899b0b47e72 SHA512 09cf5972b6d7ae61fe87246df675229c73c37c8d510b1e56e6ffce4d445fa75578efdbaba26c7cda23d588f68c75ea9f27a854f2d5e0cba00e6c8bdd515eeada
-DIST vector-0.10.12.3.tar.gz 103617 BLAKE2B cd4a4fda8a3da5b431c316d04b23eb82947f08cc930059beb3182c9c68d646c6a767168ae2fd82d06a782991b055421a0558dbf41a1e92f06d265c043cdb2048 SHA512 2b2c98f1fbaaf4f5e7243e18a08e373e85acb06dddf73a48d34b966bfd736efc72880babec9c47859bd8d6d6928a28ac9acd9134eb0ef61b2f88fa31bf18811b
-DIST vector-0.11.0.0.tar.gz 115558 BLAKE2B e2475a37593b92f896c48ff85f6e506fb5011d89173bb0fe12492ed8c6f9620f426c9db88cbc274b37aade52bf6ca3cbdc7cf03b013371b37f2d1b42c348a117 SHA512 4f31e45d08a08c09e5ce73cca4da70e954bf3921d05130b9458c7f2ba267602e0aafc96496595000fd7b82f80aa9147c880917dc64086dab7bf5b2cd426539e0
 DIST vector-0.12.1.2.tar.gz 131049 BLAKE2B d77981f49b89cab1aefa3237d87e84ae36c4586c20ca3f359c0855e3f3e15b8087849590bde06bd2017d83d92d8ff03ff1b9d8d949ceab382865707f16c723b0 SHA512 36d0237cf7c5a6b78f88b33ff09ea8b19baeaf85609efdeba9ab802ca588956457d4607304b73e8d58e9e802a9101c23da62caee71508f069047a6d531e50170
-EBUILD vector-0.10.12.3.ebuild 1549 BLAKE2B 6acaad9a8c59df264a3e80defaac6e335183acf49fdbd85d5bb0d21c1a1f60a84b045baf12788c4f4900cc169906bb7b52da6622d23fb5319878ac7611a411bf SHA512 9dc4c38a660ed0b11fcd4f5aca7d6d558f7a67624d21e35c38040d754551934ab2acb55762955870662a449ebf405433591a20217a9e3245d51d883671e207b1
-EBUILD vector-0.11.0.0.ebuild 1203 BLAKE2B dab98d15c9ef771b2c8500eb266a62e2b9b136aa7c3aa8b011d9eeecdd4c81b4b5f971b7f56a30f18be9d530fd166ffb2a36d59d2b04b1e9027670411962135a SHA512 38845b6cee9d1d892e8d351cf19024e41bd1f39543f4c8a2bd18f6ffce06e40640e2893d019aec84f7b5382a035826975ac7718e58e6f0e53ba7ab29342a9894
 EBUILD vector-0.12.1.2.ebuild 1365 BLAKE2B c7ce3ddcc514f6711f58afc2673782478be650b9844b1c68a591f90ed97fe7aada80371fa0e3888c3714bebad0c25839ec49f894b41b55d76235bcd70ff01350 SHA512 7944081c43ce39110055fe15f359b60187535404860ef6fe7e112e5aa0a77ecf53a6010ce4f6f1b5bb234df24b81197ae4ae157346d4454831176e7110db9c8c
 MISC metadata.xml 2431 BLAKE2B ab4b371c0626e51fa792aa18b7a7622921ea12a7b76d8855441865f46372a3dfa11fd0d0acdafb11983b614b6733325a28711d149660d3e0d874fe24754cf7c4 SHA512 58c6d75396f364fa29acf4287a1411448c2a77f5589be30fc83bdde998773f15c5d5a4fd7e6e95b5454c33ad49aa367a6b557c445612f85f99924520825002ba
diff --git a/dev-haskell/vector/files/vector-0.11.0.0-primitive-0.6.2.0.patch b/dev-haskell/vector/files/vector-0.11.0.0-primitive-0.6.2.0.patch
deleted file mode 100644
index 3b78ad74efc3..000000000000
--- a/dev-haskell/vector/files/vector-0.11.0.0-primitive-0.6.2.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Data/Vector.hs b/Data/Vector.hs
-index db6dfb7..f074bf0 100644
---- a/Data/Vector.hs
-+++ b/Data/Vector.hs
-@@ -152,3 +152,3 @@ module Data.Vector (
-   -- ** Lists
--  toList, fromList, fromListN,
-+  toList, Data.Vector.fromList, Data.Vector.fromListN,
- 
-@@ -222,4 +222,4 @@ instance Exts.IsList (Vector a) where
-   type Item (Vector a) = a
--  fromList = fromList
--  fromListN = fromListN
-+  fromList = Data.Vector.fromList
-+  fromListN = Data.Vector.fromListN
-   toList = toList
-@@ -343,3 +343,3 @@ instance Traversable.Traversable Vector where
-   {-# INLINE traverse #-}
--  traverse f xs = fromList Applicative.<$> Traversable.traverse f (toList xs)
-+  traverse f xs = Data.Vector.fromList Applicative.<$> Traversable.traverse f (toList xs)
- 
diff --git a/dev-haskell/vector/vector-0.10.12.3.ebuild b/dev-haskell/vector/vector-0.10.12.3.ebuild
deleted file mode 100644
index 737b447e1554..000000000000
--- a/dev-haskell/vector/vector-0.10.12.3.ebuild
+++ /dev/null
@@ -1,53 +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.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient Arrays"
-HOMEPAGE="https://github.com/haskell/vector"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="+boundschecks internalchecks unsafechecks"
-
-RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9
-		dev-haskell/random
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2
-		>=dev-haskell/transformers-0.2.0.0 )
-"
-
-src_prepare() {
-	local can_spec_const="yes"
-
-	cabal_chdeps \
-		"QuickCheck >=  2.7  && < 2.8" "QuickCheck >=  2.7  && < 2.9"
-
-	ghc-supports-interpreter || can_spec_const="no"
-
-	# ghci-less GHC can't do ANN #482960
-	if [[ ${can_spec_const} == "no" ]]; then
-		einfo "Disabling 'ForceSpecConstr' due to bug #482960"
-		sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \
-			-i Data/Vector/Fusion/Stream/Monadic.hs || die
-	fi
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag boundschecks boundschecks) \
-		$(cabal_flag internalchecks internalchecks) \
-		$(cabal_flag unsafechecks unsafechecks)
-}
diff --git a/dev-haskell/vector/vector-0.11.0.0.ebuild b/dev-haskell/vector/vector-0.11.0.0.ebuild
deleted file mode 100644
index f78779315b57..000000000000
--- a/dev-haskell/vector/vector-0.11.0.0.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.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: #666812
-inherit haskell-cabal
-
-DESCRIPTION="Efficient Arrays"
-HOMEPAGE="https://github.com/haskell/vector"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="+boundschecks internalchecks unsafechecks"
-
-RESTRICT=test # -O2 -g makes tests build hang
-
-RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-PATCHES=("${FILESDIR}"/${P}-primitive-0.6.2.0.patch)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		"QuickCheck >=  2.7  && < 2.8" "QuickCheck >=  2.7" \
-		'base >= 4.3 && < 4.9' 'base >= 4.3' \
-		'ghc-prim >= 0.2 && < 0.5' 'ghc-prim >= 0.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag boundschecks boundschecks) \
-		$(cabal_flag internalchecks internalchecks) \
-		$(cabal_flag unsafechecks unsafechecks)
-}
diff --git a/dev-haskell/wai-conduit/Manifest b/dev-haskell/wai-conduit/Manifest
index 69184edbcd85..a53e30c2ee67 100644
--- a/dev-haskell/wai-conduit/Manifest
+++ b/dev-haskell/wai-conduit/Manifest
@@ -1,3 +1,3 @@
-DIST wai-conduit-3.0.0.3.tar.gz 2129 BLAKE2B b85282eb13e4452e306eb0b1c08f63576fe1abd63458c3bba754275925d3c1c15621be8e5b4209113224ef5afc3ef0e4cae0afc4414715b27a9b9c27759d1904 SHA512 adf6c507f53dfd5eab33cc713528d27fd37d044262024626e89da1489d9315e2fbd47a1a3fb00384858a79101482cf056349e17a0614e6788613e67bad1ff976
-EBUILD wai-conduit-3.0.0.3.ebuild 734 BLAKE2B c0dc6317771a2d6698205eb5bf25d0a6940fb9486e781abf6280bb5389bc8a19d7ca550ede0b8c60adc6c1a51078ad18b97f0c02d8529a59908a3d7d518ed6f0 SHA512 c91ffb56e72adafced878ec4c8989fc9176cb4b98400b1966092ed63c9db177a1a64abf662ac12aab0eb0e40bdaebc067c02b32fd4c375dcf12bf262557a54d4
+DIST wai-conduit-3.0.0.4.tar.gz 2151 BLAKE2B 58cfa6e727cb2461c9d8978b61391d4dc5ddf01a64c1719e2ae71cf3cefb9768ab64c389d8772fb80159fbc34c5ff5d31a00d5d2519a6b74cb3a1eb022c44305 SHA512 49f1a2b53912a899b4cf427a72ab7c34994fd86810e5345233de34a611c71b970ff09e8fa33c93803950c2991a7c22c9b0b6d277fc9aca64bb599af60415ae70
+EBUILD wai-conduit-3.0.0.4.ebuild 656 BLAKE2B 8803add91fa90dfd0250329544aee72625492852881c4ea26bbb847ad8c26c1a71a08fed649ebff7ef905648615aa22ed252b199bbdc040ccbf70a41d335f67f SHA512 f26c9450a7a7a2cd93abb50a625cb8ee0cd6d6146fb2246b126d984344504bf857fc9e116aa7fe7eeec3eb476275191a39c4014f5a40f844fcf259142a8aadab
 MISC metadata.xml 510 BLAKE2B bf53d664a32a9dbb1d6fac85569e78eb6b9ac663283e2c37a364e3e194a0845064637dcf3e97be83c66d0db5245549194f6193e49d4bb2393a3d0fe8082f6518 SHA512 c6100f6b2edf90ee715f63f290dd16baffacb5e40ee0683fd5e43c8fb260a9725200c0315024558e76bcdd3aed78f8e027d630b095ceaca03baf04b9fb2b3139
diff --git a/dev-haskell/wai-conduit/wai-conduit-3.0.0.3.ebuild b/dev-haskell/wai-conduit/wai-conduit-3.0.0.4.ebuild
index 0912b88e9cd8..b81a100250f6 100644
--- a/dev-haskell/wai-conduit/wai-conduit-3.0.0.3.ebuild
+++ b/dev-haskell/wai-conduit/wai-conduit-3.0.0.4.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.6.9999
+# ebuild generated by hackport 0.6.2
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,13 +17,11 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/conduit:=[profile?]
+RDEPEND="dev-haskell/conduit:=[profile?]
 	dev-haskell/http-types:=[profile?]
-	dev-haskell/transformers:=[profile?]
 	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
+	>=dev-haskell/cabal-1.18.1.3
 "
diff --git a/dev-haskell/wai-test/Manifest b/dev-haskell/wai-test/Manifest
index fa727020925b..087f4fd1e341 100644
--- a/dev-haskell/wai-test/Manifest
+++ b/dev-haskell/wai-test/Manifest
@@ -1,3 +1,3 @@
 DIST wai-test-3.0.0.tar.gz 1227 BLAKE2B 4a99ab99810cff2d3b2fbdc7c36acc239d1ab8d15ffe5d4d9d8c953c01de2daca63279a6f36f2850740f8f945f8e7edc6d756a6516acfc686c45a35d9af8c400 SHA512 2c7f8788f3a51f94b02a2d79b7ad40c0f92f3756163b1e4c0981e92c3364c822b6a1cbf2b7129fd6974a745774f2dbffe1a6097e362d183bc2e30dd62125666f
-EBUILD wai-test-3.0.0.ebuild 601 BLAKE2B edce183503be97b8eede7dfad76c70f4df0a8c0596cf359be0a325fc6fe7128942c930512aa44497540a4d866052ef04646cad0720266eb37bfafe0a63b28ab7 SHA512 4fd47a9f9effd3a250abe840fd245245302a01b50c966b0dd02d91b7ed00d24ae0198e07c452c7da31af143161b0aa83ee597992bc6526fbc3823db6d8ed57da
+EBUILD wai-test-3.0.0.ebuild 625 BLAKE2B 353c36d145509fba52ca7464e7d4bd56487292ef743271635c9c1026402241ba62e42072721d4e27dfb141c7bde4c97e973cea0129ca30ffca4b815319bd7aef SHA512 86ef9ef51994b8fe432d2b59564841058fdc6cd2c4bc18307a20d50dfbccb5e0b62f03beba0352d034a4f9c03ef0ac0c086d3e49de60fc76649efda5dfaf1d5a
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/wai-test/wai-test-3.0.0.ebuild b/dev-haskell/wai-test/wai-test-3.0.0.ebuild
index 183057606b1f..ac41acae63a8 100644
--- a/dev-haskell/wai-test/wai-test-3.0.0.ebuild
+++ b/dev-haskell/wai-test/wai-test-3.0.0.ebuild
@@ -1,11 +1,11 @@
-# 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.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="lib profile"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Unit test framework (built on HUnit) for WAI applications. (deprecated)"
diff --git a/dev-haskell/with-location/Manifest b/dev-haskell/with-location/Manifest
index 2cbe65f039ac..97785197b75c 100644
--- a/dev-haskell/with-location/Manifest
+++ b/dev-haskell/with-location/Manifest
@@ -1,3 +1,3 @@
 DIST with-location-0.1.0.tar.gz 2029 BLAKE2B 0d76733cff25a2dc3603ddad7b0806d43e2007017f73ec8773f6d00db0f7830eb2a30e324a5044654b7537bb9a43d453dbe50fd1ee89668fbbc465a5a27f90ee SHA512 1b8bdecd02d4acaa8b21e2cd6acdee573ac29b909c9a6f0d88a56adcd7433d551db5c1fadbc3e72c78378d74a614594d8d2ad08899fd63ecc57c65d0c37b28b9
-EBUILD with-location-0.1.0.ebuild 618 BLAKE2B 285f06b14511b78e4c6819cbe5d0a6fbf4391e0be98d289960d72ddd69596715351500132c6cfd11269493d8cfa8d4ef96a5ae1f98c19d51b008dd13a0ab8e29 SHA512 d11824d7c63645221d60e569ae3441b82f57371268e66879ba7e2525a7203461024480e14bc84f6feccc3ab73f4ef2e26f3b1881fa2433dde9b6b0bd33bf6396
-MISC metadata.xml 331 BLAKE2B cb1415a8d0a7322d04f6abd13bd74518626cbd60fe2207df8b53e56c390f900353273b90622f3e5a71010af02edf540e761756ec850fc37886f4ef6cf9a60984 SHA512 4813f57cd3ed8f1b20c62a21852dcc38b491923f63c9c0947dbfaca6b8b9b9ccbd62e8e620106ca3fd04be6f4823a2c808bf7e13e42a2f723d217e5db694e8e7
+EBUILD with-location-0.1.0.ebuild 618 BLAKE2B 969af0cd7d46421d1de453d59ec0892b8e201fee6bb727b49059897b17aa9f88894fce9d49fc8bea02ad24a60c6ade4655e8dbfea2a70c8b4afbc349e63c1ec3 SHA512 5cebd93257a1e31f6c0b6903257b3c2c8224ba906a6c5f9d9d5fd4fa2d0fec59cdb2ed0a3306a9f0894af93d16a79ed098cbd5952a860d31d4326823ab8e88f7
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/with-location/metadata.xml b/dev-haskell/with-location/metadata.xml
index 9edae7c8c96c..b7878815d80d 100644
--- a/dev-haskell/with-location/metadata.xml
+++ b/dev-haskell/with-location/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">sol/with-location</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/with-location/with-location-0.1.0.ebuild b/dev-haskell/with-location/with-location-0.1.0.ebuild
index 746345fec933..392cd60b3e2c 100644
--- a/dev-haskell/with-location/with-location-0.1.0.ebuild
+++ b/dev-haskell/with-location/with-location-0.1.0.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.7.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/wx/Manifest b/dev-haskell/wx/Manifest
index faf5f628b2a4..d02527f03b3f 100644
--- a/dev-haskell/wx/Manifest
+++ b/dev-haskell/wx/Manifest
@@ -1,3 +1,3 @@
 DIST wx-0.92.2.0.tar.gz 50938 BLAKE2B 3a1b8c4391c73c78d8aa635e48ebd135671bbec4c5312de715966f6596e2201c50c8284c69fd8f873c65e72a654944374c757de4e8c4afe81939e9771a318d77 SHA512 f8bbb2598fc1555030ebe3084737d6f8c0691a3e2fddd9b979c4694442b458937a9bb6afe347b2a5661b7d70339194087ce083ad6efc01173bc0f62b72bf1134
-EBUILD wx-0.92.2.0.ebuild 986 BLAKE2B d14b71d47837b82d9a5ead2221b94da259c73b6d069270ac2bbcdbbd350620467997b5664010635c6ea09f9307e4bf05546fd759d01f2400797bbe6386b723d7 SHA512 c0d72fd655c32d0b8f27e9df40e5357c0842f1d83d292cf7bb1bbc4facf2d7b39faeeff55e725afb8f227063347ade88a066dcd871ad2d8b1c56e9fb2ba1ff4b
+EBUILD wx-0.92.2.0.ebuild 986 BLAKE2B 5fe3cc526ab7a6ab26579b37f8ce344f9440df5fc16acced5f876dd749ea14c9d697a0a1c3608518c7bebbb563a2c93186b3feed9c37f2c42ac0aace5834bd9d SHA512 534d870cbc9696b0620c2a5477864946c2b96d058625e6f581cd922491cdfbff8aa4cce3240087fddae2d6e8ca6cd9c8e7e07ffa2d5190e928624a92a1d620f3
 MISC metadata.xml 549 BLAKE2B 7645a80403b4176584de8783c6bbf36df125a59aeb27867d88e048d35de11f8f69df2b80a88ceeefdc200156c81a5b3d0db8288a2afb0e2c7219efd5eced2fb9 SHA512 5914f30a0be778084cb801fc3521cf85490a67b9f5a0ee1c5cadb9bd44441c8d1a1840275944d8d1deee334289fd86b7b71bb4b4ab73700e25333f2658ce0d26
diff --git a/dev-haskell/wx/wx-0.92.2.0.ebuild b/dev-haskell/wx/wx-0.92.2.0.ebuild
index 2e387aae3817..5788c33b8ef5 100644
--- a/dev-haskell/wx/wx-0.92.2.0.ebuild
+++ b/dev-haskell/wx/wx-0.92.2.0.ebuild
@@ -1,7 +1,7 @@
-# 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.7.9999
 
diff --git a/dev-haskell/x11-xft/Manifest b/dev-haskell/x11-xft/Manifest
index a3f47ad912a9..87864bd573e0 100644
--- a/dev-haskell/x11-xft/Manifest
+++ b/dev-haskell/x11-xft/Manifest
@@ -1,3 +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-r1.ebuild 773 BLAKE2B 133ff7c0f1103aab1414295ce06b87147090fd44476dbe5a4dd64fb7d5adf32907ec07ab62ed21c2bd8d45c1b30439f83a04f0abf349f1c31ee7e43372786ff4 SHA512 d40cdf9bc46d5f746d10d1c9684ac1b227ab9f8ade7f277750576dc03a4814863d0651045086d46f24b54dfdc043c8bbe4e1661b7761cd273257f927c507e4db
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild b/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild
index a55c7498c3cd..22e82ae5438a 100644
--- a/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild
+++ b/dev-haskell/x11-xft/x11-xft-0.3.1-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=7
 
 # ebuild generated by hackport 0.3.2.9999
 
diff --git a/dev-haskell/xhtml/Manifest b/dev-haskell/xhtml/Manifest
index c634df6619d3..1d51f9104246 100644
--- a/dev-haskell/xhtml/Manifest
+++ b/dev-haskell/xhtml/Manifest
@@ -1,5 +1,5 @@
 DIST xhtml-3000.2.1.tar.gz 14555 BLAKE2B e6617914fbcf4ea56b7ffbf7790305fe6c89a27f2a24a50e54cf8a13d57c5bfe66731c47bf41c3163698ae6ce98a8566199c952bca9df22ead5e1a8d9d9a2cdd SHA512 a3e901f6173e3885717ee5e451f8ea8d2ee61cbb159335eb69b0a7e097dbad350b1919aedd7f9daf530147fea7982921fc324df41112e69ed362d143fe327342
 DIST xhtml-3000.2.2.1.tar.gz 14647 BLAKE2B e1e0bf0e0f9927fd8299e67925b45caa2f265302ec940c6ec50ee464bb2fecf94d9bd14d4ee5909d7ae1564a71d1891241ecd99598a2a9757aff45b8caee8714 SHA512 0843042fb40e11ad0f47100fbead8a6eadf2d9d1d8d530195cd5100d9a2a9b81a8cf5118bcce40239e5f4fc3875ac7809791b32d19055c6fdf0b4d0cc72b207d
-EBUILD xhtml-3000.2.1-r1.ebuild 787 BLAKE2B 335f29e31c53ece9707dd6f9310549512fbc39bb3028e3fa6c1e1644d6a29f935e081a00da4f5dc7058fdf4ffde85fcde58e89a2899e4d40a04894e0ba8042bc SHA512 6194dc15c36843c0df08fd850bafc42eb20f45efd88b703b92a756425d1c43dc70f6ae3be9f73c8c32b8117a1ff207b3fa2c19daacc2ac6faad10d0c4a1f6cde
+EBUILD xhtml-3000.2.1-r1.ebuild 787 BLAKE2B 8a19ee7cb5fad968f20a1770ddd24d83ace746b90b37af32e4431c95a7be9c1e48b04816ab0b8d8442a000e937ee1972e081de7da9ec7b7df3bfb3090b5d974f SHA512 66dd8c595dca9f40e9f28907bf1bcca49033e23b4fd192915605714e165c187c0921db78957310e4466e9e73e4350148ccbbdb7bee9a0e905e6552538e93df56
 EBUILD xhtml-3000.2.2.1.ebuild 695 BLAKE2B 5687e7a9bab589c8bd56515af32145016852c8a312a51f6d01045730653f28d333e43c8a8bf9401d8e5a2885cb4dfcf4fca79465744b069e5bfa901e7aaefd10 SHA512 fbbac568878f53acafbbe20e00f036bc6017919f789a29b773d699a7ac001cf7aa0cb020431656e1ba62dc243ee6df24ac56800d4eb90abc27b50176f146d1ab
 MISC metadata.xml 305 BLAKE2B e7048400b3dc0c789dbb2c34c23f18373deee9b55f53ae669b3d55f1aed654e486fc258fffe9f733fa688600069420adc0496627ced8d08084e7774e5dbe5b70 SHA512 0270a7ac1593d87c819597c6adf0c5658415e1338423c2c1cf254c8d2b9edb879b7776114600ae034b4b667ea42b53b1c372e8fc09c944a017303bbe04ea3453
diff --git a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
index 66f29191029f..182e71d969f9 100644
--- a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
+++ b/dev-haskell/xhtml/xhtml-3000.2.1-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=7
 
 # ebuild generated by hackport 0.3.2.9999
 
diff --git a/dev-haskell/xml/Manifest b/dev-haskell/xml/Manifest
index dac417460c38..a1f5292c19b9 100644
--- a/dev-haskell/xml/Manifest
+++ b/dev-haskell/xml/Manifest
@@ -1,3 +1,3 @@
 DIST xml-1.3.14.tar.gz 12048 BLAKE2B bc30ff6dbc0da5554967b8ac2901cdb535ec0429d35c161f886a6172b3d5aad38e8f32dd2ec496b8acf3d21dbbd21880b148590623aaa305a15adac1c45541c2 SHA512 2ddaa6c837fe85a06c751a66ae2c185fb7190f51f24649a668032b048b3e1b15982b45c86dfee4131453f0bd1ed704e934090bbede252a2b6de30c5f4ad44137
-EBUILD xml-1.3.14.ebuild 536 BLAKE2B 8bf4a969771c9e3f0e2ffebf048350ead45e1920c30c89475283125dadd766e32a588455276058e36540de35779daff39037ebe150ec849d4aa5db6840ce55cc SHA512 213302a7037b85e4529ce92af4917868c5c8f18518817590ff3da77c5174870a98da00362e713fb2d8712651ec7ef486987a2dd033aeced69edf49de7a0c4bc4
+EBUILD xml-1.3.14.ebuild 536 BLAKE2B 8d6b9c321ae5060d343af46f08bf51c7f486d91b601a049e239246cc221948aed022b48978b34ca3b3c763df3af8712ef88b59a31d9439e03f1ea7a1b789b171 SHA512 f4d5dc37cc2ea3ee64423604921552ea2f6204418d68cc67150aca29e4444f1d80784fe93ed057a20c25e7286e71fcd29564c2258cbca99a0aab3283f639b573
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/xml/xml-1.3.14.ebuild b/dev-haskell/xml/xml-1.3.14.ebuild
index 3a0f55cfd680..f94585564f07 100644
--- a/dev-haskell/xml/xml-1.3.14.ebuild
+++ b/dev-haskell/xml/xml-1.3.14.ebuild
@@ -1,7 +1,7 @@
-# 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.4.9999
 
diff --git a/dev-haskell/yesod-auth-hashdb/Manifest b/dev-haskell/yesod-auth-hashdb/Manifest
index e613f7493c97..6d5fe4d99c36 100644
--- a/dev-haskell/yesod-auth-hashdb/Manifest
+++ b/dev-haskell/yesod-auth-hashdb/Manifest
@@ -1,3 +1,3 @@
 DIST yesod-auth-hashdb-1.7.1.2.tar.gz 15751 BLAKE2B cff24e8957a68539c168466f77433fee064aa76b8426e9c1023ff704c990d0b774341c113bae066b30bbcb01e1c1199f8c6dcd9431e574838c67863a63f791a5 SHA512 417c5113530b6960f30e5209f0188c5367361acfbea2eb60a6d30a9facb5a3be6d8547dfa504da4f7a7585d8c848adbaafa0a28ffea6930f9954071e6e2647e2
-EBUILD yesod-auth-hashdb-1.7.1.2.ebuild 1483 BLAKE2B bea18ad52c740335dc9cf025c3d742fca26d451e5f71f03f1679e8ccba6a5b14ad584dc10b76ffffe929e8481447388a005ae3e41ad86b952a585643ee32a238 SHA512 1454a66b652006a6e0c23e160857b68b5996bfb28227e7bbaf6752bd1f30e76f7699443ebfdfcabfd51a89efb07462998284586b46c9d3afd971c8821b653b07
+EBUILD yesod-auth-hashdb-1.7.1.2.ebuild 1405 BLAKE2B 7b780e3f0b0fffd171b95651a633a0945c498c322837ee0eca121008f8c08ba268de8ffb88ab167195d5b996b0bbf821a3af922d796cacc79c72c6fb2a46faf5 SHA512 5e5b158e9850c7ec6487212b598193be3a8b8311a53a907a752e48d7af4cfdb33742c94e46d00f7bbd17ba4bdc9d27d32c3b12f1d21d0707ef95e82adb5793c8
 MISC metadata.xml 533 BLAKE2B 1998dc0e033193c2d851920adb947655cc7f22b1cf78b0a734375e7d690df376a6deaba55f1a5ddc04fb398eea8bbec09c83fa333765beb9e0fddbb3d5802b8a SHA512 3989f0ef1df278ff8029a07467fb909c775af723078a5053f89fd86b0cb0cccde6d5ef29d8808c3290bfaedbd8b90e07f7f7b39045f1833b39886343649d3183
diff --git a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.7.1.2.ebuild b/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.7.1.2.ebuild
index 67438bbc6ba1..0903427866fc 100644
--- a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.7.1.2.ebuild
+++ b/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.7.1.2.ebuild
@@ -40,6 +40,5 @@ DEPEND="${RDEPEND}
 		dev-haskell/wai-extra
 		dev-haskell/yesod
 		>=dev-haskell/yesod-test-1.5.0.1
-		|| ( ( >=dev-haskell/yesod-auth-1.4.18 <dev-haskell/yesod-auth-1.5 )
-			( >=dev-haskell/yesod-auth-1.6.1 <dev-haskell/yesod-auth-1.7 ) ) )
+		>=dev-haskell/yesod-auth-1.6.1 <dev-haskell/yesod-auth-1.7 )
 "
diff --git a/dev-haskell/yesod-core/Manifest b/dev-haskell/yesod-core/Manifest
index 53c50caec600..6197c8410676 100644
--- a/dev-haskell/yesod-core/Manifest
+++ b/dev-haskell/yesod-core/Manifest
@@ -1,3 +1,3 @@
-DIST yesod-core-1.6.17.2.tar.gz 97530 BLAKE2B 32f0a511ae1fa2250843470b0d4338938b9385287e09dfdf8dcef0316727b8fa93b6647458a18357ae39000d51e55b21ce99e7e46b1572a2977ca2d1321c0227 SHA512 6d07d84ced61800a2b6448862d40c77f3e36afe7d09722e45d276797a80698b40ff5dfc8f67092cce7a6759e4e325ae113fdcd0550524c42334bc15d439dfbf9
-EBUILD yesod-core-1.6.17.2.ebuild 2254 BLAKE2B bb8f7f443152d15390c69b4bfc34c7e7d0d0b6ea160ed49ab4a17bc57b566eddc217f9aba9bbaa6f52fa5810f24fc94f45eb9f2f64f6e507c1137fe893f49889 SHA512 afbd4eb6850a813d239495a651fa6e234cb9b6e1042540479f64730027f7f5155d6bd346da59df0a3529844156d5ef136fe82adb327646a104198057829c5f48
+DIST yesod-core-1.6.18.7.tar.gz 100141 BLAKE2B 0d00fffcc4371868f02ec5ec1fe4f5af15369f62b7bf88562e8c092b3988824cbbe26defd574f2514d23fca983f81cc951b75f564213f568d244069e352cc198 SHA512 fde155df74588d2eb9824e0f423b666228a1b681a83c4f30e194c8816667cd6e4fefb7cddcd66f6ff2ca745ad3ef8daee439a133b017d8583167b54a698a12a1
+EBUILD yesod-core-1.6.18.7.ebuild 2259 BLAKE2B f0d07b0936656494a299188cb715cd1d81cc0a387733e5b84064302357ff9b3365df2ceeb5827ddce1aabc93bc0a134e4cc74a57affd6e1f30a91405f6ca0f0c SHA512 88014380c1addddb673fec2d076e94e4b30db63684e1d513e7a259d5624a5b9cef287037eec662dcaf3848d9196126d6494e17a2b117064284dd5a5a58e2bea0
 MISC metadata.xml 722 BLAKE2B 8f4f6d4c278f92f847046b4c85c35c78e2a114b17766bdb24e7b7f2b48a48f9b7aca69c4eac626dd27b5b3eda92b18f0cd11f2fd39db2f8c348f030ce1d5da07 SHA512 a0a229d4867993c1256e99c804f503bdb9461a11003b9f616d2f8985d700aaa6821949316faf5e18a202a05f802f34a0c42ea237a86cbbde076c6279d7be5135
diff --git a/dev-haskell/yesod-core/yesod-core-1.6.17.2.ebuild b/dev-haskell/yesod-core/yesod-core-1.6.18.7.ebuild
index 3940069db56c..8398bc10dcff 100644
--- a/dev-haskell/yesod-core/yesod-core-1.6.17.2.ebuild
+++ b/dev-haskell/yesod-core/yesod-core-1.6.18.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.4
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -37,7 +37,7 @@ RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
 	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
 	>=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
 	>=dev-haskell/primitive-0.6:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.3:=[profile?]
 	>=dev-haskell/resourcet-1.2:=[profile?]
 	>=dev-haskell/shakespeare-2.0:=[profile?]
 	>=dev-haskell/text-0.7:=[profile?]
diff --git a/dev-haskell/yesod-default/Manifest b/dev-haskell/yesod-default/Manifest
index 76da4362de1f..91d45fb7749e 100644
--- a/dev-haskell/yesod-default/Manifest
+++ b/dev-haskell/yesod-default/Manifest
@@ -1,3 +1,3 @@
 DIST yesod-default-1.2.0.tar.gz 1397 BLAKE2B 9ec72760a47bc5ad36da19ae2e1f42bbf758d0ddb45c5c1e9450600296c26d402ca91719cadbac5ac0a82ec912f8d54b695964dd86e19b9151c380350a3290ab SHA512 35952255a12d7f661bca1312c31a2516fcce64046018e58f10811dd2c7439c2f4faaac622946e6ec64153972fd33d0c00f575f3cba196d99658c4d46c0d1e18d
-EBUILD yesod-default-1.2.0.ebuild 605 BLAKE2B 4c820b6dbc4388f33c6a8b143ff4925c35df5bed5fc262f8b84de659124f1172c58761d19246f8237f937fb1607589c60b1d269fd4228be3fe3ca872204b8095 SHA512 12ee2a585d0c89b14c04f3cf1d4b642917c72a940e49fd218e86e15cf823fcf55b91c92efa82792d7456de83be7d3675bdf63500be14453f352052978bd60721
+EBUILD yesod-default-1.2.0.ebuild 605 BLAKE2B 6a1dd6eab628760c39733ff5bf356866188152911da01b8821dba81f95c10b4c377c0bcac85f447864f5a9495da132a08cada79c9bc0e2d0708b139e49ad7273 SHA512 1584eac9413802fb87303d16231c80b830f4c438f6ca176cdfb211a40416acde15b89c2b739e5f24f249dca6c926760a5b67f84008e822ecac3929ede9b8acc0
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild b/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild
index 6c38ba24a775..73953d021950 100644
--- a/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild
+++ b/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild
@@ -1,7 +1,7 @@
-# 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.3.2.9999
 
diff --git a/dev-haskell/yesod-json/Manifest b/dev-haskell/yesod-json/Manifest
index 56269c6352a7..892ee006448c 100644
--- a/dev-haskell/yesod-json/Manifest
+++ b/dev-haskell/yesod-json/Manifest
@@ -1,3 +1,3 @@
 DIST yesod-json-1.2.0.tar.gz 1373 BLAKE2B d1e7d69aa98685fd6a77274a52302b9aa9b7614a1363f272209620ebd4f267062c4c7d5964c4f48a4d5a87571f02616a0b3bdbd834916f4821d271fa6257bd68 SHA512 9fa3eb964e5a543d4f38293245a8ef7f585c5ead94dd0fbc028fca5c954401eafb11e3d18a60a12baa82d3cedce871271b8320d65996f0b00021804c00da0dbb
-EBUILD yesod-json-1.2.0.ebuild 596 BLAKE2B 8a6af3064e73721f4612847838551cc92e57c2335231bb6e2abfa6d97bb3863583413622ca3d634b8e99a57f754fb534720c685ec6424511c1c0929f7a621b36 SHA512 eb11288d0af5cdd4628f48cfb8df005b226ec8d1c0bac309a06b4dcefeaa7787987aa153181ca0c7ca2d028a0fe687220cabaa5c61083a6b0051d15f41655eef
+EBUILD yesod-json-1.2.0.ebuild 596 BLAKE2B a31e5f33b74229c087ac8d4ce0e3b5dc91d32bab1b925f77b8a39061cc93fc1f0400ca585b7df1863bf65bb754a2a894e617f69a6a13ce65e99a6787ff83f6d5 SHA512 7903d0db8c8ad604e15b857153663138b88b653278e60045822c7a189d34988550f1ba67de3f376445e8ed66e37c199b91b6cdf880a6aaabbddefa12ca25b228
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/yesod-json/yesod-json-1.2.0.ebuild b/dev-haskell/yesod-json/yesod-json-1.2.0.ebuild
index 2ddf8f640ae2..18b5c96957cc 100644
--- a/dev-haskell/yesod-json/yesod-json-1.2.0.ebuild
+++ b/dev-haskell/yesod-json/yesod-json-1.2.0.ebuild
@@ -1,7 +1,7 @@
-# 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.3.2.9999
 
diff --git a/dev-haskell/zlib-bindings/Manifest b/dev-haskell/zlib-bindings/Manifest
index e8f054c4e65f..3a257404996f 100644
--- a/dev-haskell/zlib-bindings/Manifest
+++ b/dev-haskell/zlib-bindings/Manifest
@@ -1,3 +1,3 @@
 DIST zlib-bindings-0.1.1.5.tar.gz 54770 BLAKE2B df5ed0474ed29c47720b4d94bd8dee49afeec36e9ecafe6639324bbd0ff2c0ef8d52996c54b3ad09aaf3a1b84ee8898bdcddc91705e33847e3e9e1d6cbb4af42 SHA512 1ce7a21f462ce5fb1c6ae0ccd40b6f59eb95772b46fa8f5cb3b94f76d55189b7c020dfd97cb18afe21cd826d1a511d9d02909c4376b165c2f574ec881f7de299
-EBUILD zlib-bindings-0.1.1.5.ebuild 675 BLAKE2B f131b4444c9b22b0236c9c77e795d6dbbe819add389cf45a67ff725032b23317996cb349c1cc3eaf2fb9a0a58266ff5ad2b5bd56eee9a108edc7f7a121a3fbf1 SHA512 5a843e105e7050c6f470368798722b18f057a7ac91a72a13ac70ee7b6cee18e9fef803a6b2ad3dbfd42ff0a76ac584ab09c822d5aef67765088a1a0205c8ea34
+EBUILD zlib-bindings-0.1.1.5.ebuild 675 BLAKE2B b984dc6279d5242a83810e23ebe2878a36a03bdbe4b6f49d93efade13a705e688f59e8fbf78972a0f528a5df5a72f8aa993fd186d123044614ebeb2a436b8db3 SHA512 4cba0479ae5a6e424c888e68cc44a6c0edb4e00d32f6fe83f0c0a6b549db118d33e6dc1a1795014b8b61501f1a6d79b635da2e000c9d7af72ab001c69aabd394
 MISC metadata.xml 336 BLAKE2B 5c5032359fb0794cb7c6c6c43335f9a5275cbb40e2ade73801d22e8dc54e4b0e897d1f93cc6548bf7096999244365f4975fc35a668b626613da282a5b3440d8c SHA512 6a6280e758e245a581dd198a43a18ced8bb77dd6fb944d46a3874af476e3da5df02fd7f1725b01bf584c17e5d5716fb8ecde138407dd261836cab4ffd521b59a
diff --git a/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild b/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
index d522886fef03..847e306bd483 100644
--- a/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
+++ b/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
@@ -1,7 +1,7 @@
-# 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.3.6.9999
 
diff --git a/dev-haskell/zlib-conduit/Manifest b/dev-haskell/zlib-conduit/Manifest
index 6524bc893871..8a94273f1b00 100644
--- a/dev-haskell/zlib-conduit/Manifest
+++ b/dev-haskell/zlib-conduit/Manifest
@@ -1,3 +1,3 @@
 DIST zlib-conduit-1.1.0.tar.gz 2024 BLAKE2B e7b8bcf5515cb25b2152c29db4a4f04d2050db8c999386428eaa913e296d34f6c07c136d2ff16962462b699fed20b35160ad51f079659d27b87a61bbb31c640a SHA512 5d19fa0e144b8e124486465c00b984f2e16f51e8ef0bc246fafd64b173e7dcef5b12f8cb431bb6071e4dab4a8c8f62606d47feb2cac2e36c1894216a9c8a32d9
-EBUILD zlib-conduit-1.1.0.ebuild 577 BLAKE2B 0f4706aea92d8d703fe00ef6587c1094a779f351c1a0d222fa94350565e205ba34aeaa5bdd397bbb1493daab527d04fbb3e23a64ac9f219aaa15ffe070f5a715 SHA512 bec2d8eff458a0355129d8795f8a7ea3e6ffb822851777332c1b6a49ac5406ac1cd2a85dc46eb602c91526c9dbcf6e3f3a2ba1b8a578d758a1ec0aa59a8c982e
+EBUILD zlib-conduit-1.1.0.ebuild 577 BLAKE2B b7ea3d7c36479d4a09ed372e0bbd00cb441a31b29948dd30e468d119cbb95ff686558448edaf6f14e185cf0999591231199de5f1aca6197e1329259d2786da2e SHA512 2d8ded52f5c0ac445feea2481259779a213463207fe051491029613020fbc51a73152f3b767414efe9f3a881705badc65660692360e0a2d3395ccc7413e0be7a
 MISC metadata.xml 330 BLAKE2B d56163baf6c38494b371fd7f1fcd301119899051db4735a607f802ec25550dcdac277005a9785b323311bd0e4282630ea8de2abff756b5fc1067ef4d07d6de51 SHA512 48095eabcee345441e214e87e05b66a2323a48ccf2f596601105375f3f36d30dfe5c193e717858ff4f4719e49bdb9e5c3bf85c52cd87cb039e35c2208db3417e
diff --git a/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild b/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild
index 7c0d68c1b5b7..d5459ed411f9 100644
--- a/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild
+++ b/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild
@@ -1,7 +1,7 @@
-# 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.3.6.9999
 
diff --git a/dev-haskell/zlib/Manifest b/dev-haskell/zlib/Manifest
index 5ad872a4ee2b..8cfdc23f753a 100644
--- a/dev-haskell/zlib/Manifest
+++ b/dev-haskell/zlib/Manifest
@@ -1,5 +1,5 @@
 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
+EBUILD zlib-0.5.4.2.ebuild 599 BLAKE2B deff8dc3ef1e3f142171daca391b9b7925ad1e8c9dc2792222a5d01c6e80d2308adc13d05835c6690a06196cab4e131e9dce8bc8940a2af9b3a12ede3b92d2d6 SHA512 98fcb3d7fc7559e1e800a276dbac45fafeaba53edc243e88a938596605fb57c1e23627d07cbdde5d603f8cd636d75b454cd16e4476c1c387af99d60bc9f6aff0
 EBUILD zlib-0.6.2.2.ebuild 1110 BLAKE2B ff67859d39c9353ae6a28367fe5cd70303a740201f77b45547a47f979320b136891ea7eeba2e6ed304969d3d69b8b1f1579574349be1b7491cc04baf3e743371 SHA512 daffe899a4c1bc877e3de632deee164f88ef842197db50eefce8536d99c128e71b0351cc057f569e629a9bb3104faf3ab66c1c0ebe5fc82099f5c87bc2c2e37a
 MISC metadata.xml 1169 BLAKE2B 00ccd79f20643336c55e80bf917a09ec31d214cc29629cb5cb1e838369ce8828929e7b9521d2526723ea951c97039f9135519d3cf42c07a6f547f621f4ea72fa SHA512 7955c1f302be91c1e6f864a2296d8b537c66b6b9f644c7fff67f94689e704ce182cc7d3811829883aae91b29b1fa06fb5cbe452f0b5d1e045e13bc46bf917c8c
diff --git a/dev-haskell/zlib/zlib-0.5.4.2.ebuild b/dev-haskell/zlib/zlib-0.5.4.2.ebuild
index 72e171c86f76..87c943585775 100644
--- a/dev-haskell/zlib/zlib-0.5.4.2.ebuild
+++ b/dev-haskell/zlib/zlib-0.5.4.2.ebuild
@@ -1,7 +1,7 @@
 # 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.4.9999
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /dev-haskell
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)