Merge updates from master

2026-09-24 17:09:10 -07:00 · 2023-11-19 18:46:47 +00:00
parent 92a070dddc 34ed62fce4
commit b02a99e1d4
142 changed files with 838 additions and 358 deletions
--- a/app-portage/hackport/hackport-0.7.2.2.ebuild
+++ b/app-portage/hackport/hackport-0.7.2.2.ebuild
@@ -33,7 +33,7 @@ RDEPEND=">=dev-haskell/async-2.0:=
 	>=dev-haskell/network-3.0:=
 	>=dev-haskell/network-uri-2.6.0.2:=
 	>=dev-haskell/parallel-3.2.1.0:=
-	dev-haskell/quickcheck:2=
+	dev-haskell/quickcheck:=
 	>=dev-haskell/random-1:=
 	>=dev-haskell/regex-base-0.94.0.0:=
 	>=dev-haskell/regex-posix-0.96.0.0:=
@@ -43,7 +43,7 @@ RDEPEND=">=dev-haskell/async-2.0:=
 	>=dev-haskell/tar-0.5.0.3:=
 	dev-haskell/xml:=
 	>=dev-haskell/zlib-0.5.3:=
-	>=dev-lang/ghc-8.4.3:=
+	>=dev-lang/ghc-8.4.3:= <dev-lang/ghc-9.1
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-2.2.0.1
--- a/app-portage/hackport/hackport-0.8.4.0.ebuild
+++ b/app-portage/hackport/hackport-0.8.4.0.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
 	>=dev-haskell/parsec-3.1.13.0:=[profile?]
 	dev-haskell/parser-combinators:=[profile?]
 	dev-haskell/prettyprinter:=[profile?]
-	dev-haskell/quickcheck:2=
+	dev-haskell/quickcheck:=
 	>=dev-haskell/random-1.2:=[profile?]
 	>=dev-haskell/regex-base-0.94.0.0:=[profile?]
 	>=dev-haskell/regex-posix-0.96.0.0:=[profile?]
--- a/app-portage/hackport/hackport-9999.ebuild
+++ b/app-portage/hackport/hackport-9999.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 	>=dev-haskell/parsec-3.1.13.0:=[profile?]
 	dev-haskell/parser-combinators:=[profile?]
 	dev-haskell/prettyprinter:=[profile?]
-	dev-haskell/quickcheck:2=
+	dev-haskell/quickcheck:=
 	>=dev-haskell/random-1.2:=[profile?]
 	>=dev-haskell/regex-base-0.94.0.0:=[profile?]
 	>=dev-haskell/regex-posix-0.96.0.0:=[profile?]
--- a/dev-haskell/aeson/aeson-2.0.3.0.ebuild
+++ b/dev-haskell/aeson/aeson-2.0.3.0.ebuild
@@ -28,7 +28,7 @@ RDEPEND=">=dev-haskell/attoparsec-0.14.2:=[profile?] <dev-haskell/attoparsec-0.1
 	>=dev-haskell/indexed-traversable-0.1.2:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
 	>=dev-haskell/onetuple-0.3.1:=[profile?] <dev-haskell/onetuple-0.4:=[profile?]
 	>=dev-haskell/primitive-0.7.3.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
-	>=dev-haskell/quickcheck-2.14.2:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
+	>=dev-haskell/quickcheck-2.14.2:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
 	>=dev-haskell/scientific-0.3.7.0:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
 	>=dev-haskell/semialign-1.2:=[profile?] <dev-haskell/semialign-1.3:=[profile?]
 	>=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.5:=[profile?]
--- a/dev-haskell/aeson/aeson-2.1.2.1.ebuild
+++ b/dev-haskell/aeson/aeson-2.1.2.1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-haskell/indexed-traversable-0.1.2:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
 	>=dev-haskell/onetuple-0.3.1:=[profile?] <dev-haskell/onetuple-0.5:=[profile?]
 	>=dev-haskell/primitive-0.7.3.0:=[profile?] <dev-haskell/primitive-0.9:=[profile?]
-	>=dev-haskell/quickcheck-2.14.2:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
+	>=dev-haskell/quickcheck-2.14.2:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
 	>=dev-haskell/scientific-0.3.7.0:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
 	>=dev-haskell/semialign-1.2:=[profile?] <dev-haskell/semialign-1.4:=[profile?]
 	>=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.6:=[profile?]
--- a/dev-haskell/basement/basement-0.0.12.ebuild
+++ b/dev-haskell/basement/basement-0.0.12.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"

-RDEPEND=">=dev-lang/ghc-8.4.3:=
+RDEPEND=">=dev-lang/ghc-8.4.3:= <dev-lang/ghc-9.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-2.2.0.1
--- a/dev-haskell/binary/binary-0.8.8.0-r1.ebuild
+++ b/dev-haskell/binary/binary-0.8.8.0-r1.ebuild
@@ -24,7 +24,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 RESTRICT=test # circular depend: test-framework->base-orphans->cabal->semigroups->nats->binary

 RDEPEND="
-	>=dev-lang/ghc-8.10.6:=
+	>=dev-lang/ghc-8.10.6:= <dev-lang/ghc-9.1
 "
 DEPEND="${RDEPEND}
 "
--- a/dev-haskell/blaze-builder/blaze-builder-0.4.2.1.ebuild
+++ b/dev-haskell/blaze-builder/blaze-builder-0.4.2.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"

 RDEPEND=">=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
+	>=dev-lang/ghc-8.4.3:= <dev-lang/ghc-9.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-2.2.0.1
--- a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
+++ b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
 IUSE=""

-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-7.4.1:= <dev-lang/ghc-9.1
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
--- a/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4-r1.ebuild
+++ b/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4-r1.ebuild
@@ -11,7 +11,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal

 DESCRIPTION="Chunked HTTP transfer encoding for bytestring builders"
-HOMEPAGE="https://github.com/sjakobi/bsb-https-chunked"
+HOMEPAGE="https://github.com/sjakobi/bsb-http-chunked"

 LICENSE="BSD"
 SLOT="0/${PV}"
--- a/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4.ebuild
+++ b/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4.ebuild
@@ -19,6 +19,14 @@ IUSE=""

 RDEPEND=">=dev-lang/ghc-7.10.1:=
 "
+
+# Tests do not work correctly on >=ghc-9.2
+RDEPEND+="
+	test? (
+		<dev-lang/ghc-9.1
+	)
+"
+
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.22.2.0
 	test? ( dev-haskell/attoparsec
--- a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r3.ebuild
+++ b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r3.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+lukko +native-dns"

 CABAL_CHDEPS=(
-	'base       >= 4.8      && < 4.15' 'base >= 4.8'
+	'base       >= 4.8      && < 4.16' 'base >= 4.8'
 	'hashable   >= 1.0      && < 1.4' 'hashable >=1.0'
 	'HTTP       >= 4000.1.5 && < 4000.4' 'HTTP       >= 4000.1.5 && < 4000.5'
 )
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,5 +1,3 @@
-DIST cabal-3.2.1.0-rev1.cabal 27482 BLAKE2B 7726071d1d59f6f2dcc382346d8e75d219a00bc3b8f936049b464a13224ad1cac0cc6e065a0ab0fdd1ee85d24d3d7e33abbebd603dbac4ff564f72c8aafcab3b SHA512 0d8bb2d72f825a6e3e88e5a0146a97a0ea2f7fa7c4950205ce652648abda2c74ea336654ef77b40f95865cde57126a8725c7538e0d492e74cadf7ebcd4d80d4d
-DIST cabal-3.2.1.0.tar.gz 823331 BLAKE2B 060f4808010f9eefd943312144c75e021bf02083c2a0805128da6c9b93da94ba13fe37cef1fbe27e41fe8a10610e088b923783f4b7bb57150532d3a3ea4a91fc SHA512 279088a2ab9145efc03dbdd10941edcf6034137046ee3b659a8cf0ff075a03e3edff28fd01d432d39701c5a7e05a50b99cf8de95f05d3bd4e75edb3af0e3a598
 DIST cabal-3.4.1.0-rev1.cabal 31402 BLAKE2B cfaeee44401e73fa6f80e06896ae21dcbc162a1932963ffdf44428db50a63970ef8323ae6bff0a0f11341a1d31c8b766770b6f6b892d896a27710f44dc655147 SHA512 786c52e25062b0d2934a455a623dc78f4581add2875723356ddb4ff51346e35bf9ad226bda2f25863a30e57e4e7c3ad2f2df7aed3fdbe2c888b4397841b830cc
 DIST cabal-3.4.1.0.tar.gz 836938 BLAKE2B b185d2beb91a0317b392c6f32ea47a574b8037b23f5131334bca1282359218ab94aa406be737e0fbb15458e7dfa2cba2b22f7776d42c20aeed2b87598cda0e2d SHA512 93233007b70487c76b8ceb9e475ebff0cae4c86a4694820ee505ee83d9049147d60c32c9aea5c4802faf5273adaaae66db299c1ee722aed64c716ac7a3b3aa90
 DIST cabal-3.6.3.0.tar.gz 608808 BLAKE2B 921b07d24b1f2905bd856185cdb20f519d077b729e3ae515611f6024dfbe9d8263c3f8dade6751c35ea7584b5044bf53ab5c3f5ec8dd5aa465f519c7ceb272a4 SHA512 47a2e2c6f316d49f9d20b53e6781fe0d3d874a472133d9b16c5d0be5df0fff951560974fa73dccf3fb0b53cb01c68c7f5f5d3545538d7a2c7245aca8ff602020
--- a/dev-haskell/cabal/cabal-3.2.1.0-r2.ebuild
+++ b/dev-haskell/cabal/cabal-3.2.1.0-r2.ebuild
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.8.0.0.9999
-#hackport: flags: -parsec-struct-diff
-
-CABAL_HACKAGE_REVISION=1
-CABAL_PN="Cabal"
-
-# Drop test-suite due to "circular" dependencies with quickcheck
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
-CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
-inherit haskell-cabal
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" # ~ppc ~ppc64 ~ppc-macos ~x86-macos ~x86-solaris
-
-RESTRICT=test # circular deps: cabal -> quickcheck -> cabal
-
-RDEPEND="
-	>=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-"
-#	test? (
-#		>=dev-haskell/base-compat-0.11.0 <dev-haskell/base-compat-0.12
-#		>=dev-haskell/base-orphans-0.6 <dev-haskell/base-orphans-0.9
-#		>=dev-haskell/diff-0.4 <dev-haskell/diff-0.5
-#		>=dev-haskell/integer-logarithms-1.0.2 <dev-haskell/integer-logarithms-1.1
-#		>=dev-haskell/optparse-applicative-0.13.2.0 <dev-haskell/optparse-applicative-0.16
-#		>=dev-haskell/quickcheck-2.14 <dev-haskell/quickcheck-2.15
-#		>=dev-haskell/stm-2.4.5.0 <dev-haskell/stm-2.6
-#		dev-haskell/tagged
-#		>=dev-haskell/tar-0.5.0.3 <dev-haskell/tar-0.6
-#		>=dev-haskell/tasty-1.2.3 <dev-haskell/tasty-1.4
-#		>=dev-haskell/tasty-golden-2.3.1.1 <dev-haskell/tasty-golden-2.4
-#		dev-haskell/tasty-hunit
-#		dev-haskell/tasty-quickcheck
-#		dev-haskell/temporary
-#		>=dev-haskell/tree-diff-0.1 <dev-haskell/tree-diff-0.2
-#	)
-
-src_prepare() {
-	haskell-cabal_src_prepare
-
-	# Cabal bootstraps with 'ghc --make' without package cleanup in environment.
-	# That causes module collisions at build:
-	# - pulseaudio: Distribution/Utils/Structured.hs:98:1: error: Ambiguous module name ‘Data.Time’: it was found in multiple packages: pulseaudio-0.0.2.1 time-1.9.3
-	# - kinds: Distribution/Utils/Structured.hs:106:1: error: Ambiguous module name ‘Data.Kind’: it was found in multiple packages: base-4.14.1.0 kinds-0.0.1.5
-	HCFLAGS="${HCFLAGS} -ignore-package=pulseaudio"
-	HCFLAGS="${HCFLAGS} -ignore-package=kinds"
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-parsec-struct-diff
-}
-
-CABAL_CORE_LIB_GHC_PV="8.10.6 8.10.7"
--- a/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild
+++ b/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 RESTRICT=test # circular deps: cabal -> quickcheck -> cabal

 RDEPEND="
-	>=dev-lang/ghc-8.4.3:=
+	>=dev-lang/ghc-8.4.3:= <dev-lang/ghc-9.1:=
 "
 DEPEND="${RDEPEND}
 "
--- a/dev-haskell/cabal/cabal-3.6.3.0.ebuild
+++ b/dev-haskell/cabal/cabal-3.6.3.0.ebuild
@@ -21,7 +21,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"

 RDEPEND="
-	>=dev-lang/ghc-9.2.4:=
+	>=dev-lang/ghc-9.2.4:= <dev-lang/ghc-9.3:=
 "
 DEPEND="${RDEPEND}
 "
--- a/dev-haskell/cereal/cereal-0.5.8.1.ebuild
+++ b/dev-haskell/cereal/cereal-0.5.8.1.ebuild
@@ -19,7 +19,7 @@ IUSE=""

 RDEPEND=">=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-1:=[profile?]
 	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.4.1:= <dev-lang/ghc-9.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
--- a/dev-haskell/charset/charset-0.3.7.1-r1.ebuild
+++ b/dev-haskell/charset/charset-0.3.7.1-r1.ebuild
@@ -19,7 +19,7 @@ IUSE=""

 RDEPEND=">=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
 	>=dev-haskell/unordered-containers-0.1.4.6:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.4.1:= <dev-lang/ghc-9.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6
--- a/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.12.ebuild
+++ b/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.12.ebuild
@@ -19,7 +19,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"

 RDEPEND="
-	>=dev-haskell/quickcheck-2.10:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
+	>=dev-haskell/quickcheck-2.10:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
 	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
 	>=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.8:=[profile?]
 	>=dev-lang/ghc-8.8.1:=
--- a/dev-haskell/conduit/conduit-1.3.4.2.ebuild
+++ b/dev-haskell/conduit/conduit-1.3.4.2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="dev-haskell/exceptions:=[profile?]
 	dev-haskell/text:=[profile?]
 	dev-haskell/unliftio-core:=[profile?]
 	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-8.6.3:=
+	>=dev-lang/ghc-8.6.3:= <dev-lang/ghc-9.1
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-2.4.0.1
--- 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
@@ -20,7 +20,7 @@ IUSE=""
 RDEPEND="dev-haskell/cereal:=[profile?]
 	>=dev-haskell/crypto-api-0.13:=[profile?]
 	dev-haskell/hunit:=[profile?]
-	>=dev-haskell/quickcheck-2.4:2=[profile?]
+	>=dev-haskell/quickcheck-2.4:=[profile?]
 	>=dev-haskell/test-framework-0.4:=[profile?]
 	>=dev-haskell/test-framework-hunit-0.2:=[profile?]
 	>=dev-haskell/test-framework-quickcheck2-0.3:=[profile?]
--- 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
@@ -21,7 +21,7 @@ RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[pr
 	>=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
 	dev-haskell/hunit:=[profile?]
 	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/quickcheck-2:2=[profile?]
+	>=dev-haskell/quickcheck-2:=[profile?]
 	>=dev-haskell/securemem-0.1.1:=[profile?] <dev-haskell/securemem-0.2:=[profile?]
 	dev-haskell/test-framework:=[profile?]
 	dev-haskell/test-framework-hunit:=[profile?]
--- a/dev-haskell/cryptohash-md5/Manifest
+++ b/dev-haskell/cryptohash-md5/Manifest
@@ -1,3 +1,4 @@
+DIST cryptohash-md5-0.11.100.1-rev6.cabal 3964 BLAKE2B 377323b2129dc35c1345226cffce3de90e1b584681c2c500d42767364057aafcc27825e1b524b7c65b27cb623c3fc4f9a0ec6bdd0cb65c36ce7e0768849511a6 SHA512 6b7be0bd0b5e663fd6cce73de16b6396818762a892cf30f6cf9cd08425f06c8c078cc4ee5634d843ffe4014c55c207535589a323dae1c5ff3f76883805e55b54
 DIST cryptohash-md5-0.11.100.1.tar.gz 10472 BLAKE2B cc7c99922b05c8df11a7253e6c0dd3ab1399ff739548280fa762b01c507e6d620ab51ccf6c6e791572ae432448118356d1b8879767f4ca245ae59e0daaed2058 SHA512 f2efb197005ed5f12a7c2be490a64a83186cacb34eaedec6cbd76e52c30221733da1d31201c5209538226508db760fd9eed0afc8d72643e1509b32c7287cb12e
 DIST cryptohash-md5-0.11.101.0-rev2.cabal 3104 BLAKE2B 7ee2a97bd67c9d39adb4dac059b142083ce807b1bf9e2bec8012dca3a223cce23f28ffd1f2c8587dd1c3215a2387c2d6b3f13cd3d30838183dd0bd31d233ecf1 SHA512 f1cc76e5e00197085ba8cc10eb7a771ac8a55117b51f4eac992f40f65237c70b5e4ab9b25b9312b667d4efdaea289e3f5cdc33b493ff96c9c3819efa60e67a26
 DIST cryptohash-md5-0.11.101.0.tar.gz 11872 BLAKE2B b2aafbfef1ecc51a7a21262210df478ea0d0c33539b940d71ffcb4cf28b31ff801f6fde5fb27c70a99f7ea9a1682cbbb4cf13ebbe015ee3712dda76318563643 SHA512 6116b384e76927aed06748fac6088280d1ecc7eb5886692c287e971761b98960657b106ba8a700bd0c5b2e552797079e143836af3463acd75bbac207633867a4
--- a/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild
+++ b/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild
@@ -3,19 +3,19 @@

 EAPI=8

-# ebuild generated by hackport 0.5.1.9999
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=6

 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal

 DESCRIPTION="Fast, pure and practical MD5 implementation"
 HOMEPAGE="https://github.com/hvr/cryptohash-md5"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""

 RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
@@ -29,8 +29,9 @@ DEPEND="${RDEPEND}
 "

 CABAL_CHDEPS=(
-	'base             >= 4.5   && < 4.10' 'base             >= 4.5'
+	'base             >= 4.5   && < 4.16' 'base             >= 4.5'
 	'tasty             == 0.11.*' 'tasty             >= 0.11'
 	'tasty-quickcheck  == 0.8.*' 'tasty-quickcheck  >= 0.8'
 	'tasty-hunit       == 0.9.*' 'tasty-hunit       >= 0.9'
+	'bytestring       >= 0.9.2 && < 0.11' 'bytestring >= 0.9.2'
 )
--- a/dev-haskell/cryptohash-md5/metadata.xml
+++ b/dev-haskell/cryptohash-md5/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="hackage">cryptohash-md5</remote-id>
-		<remote-id type="github">haskell-hvr/cryptohash-md5</remote-id>
+		<remote-id type="github">hvr/cryptohash-md5</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-haskell/cryptohash-sha1/Manifest
+++ b/dev-haskell/cryptohash-sha1/Manifest
@@ -1,3 +1,4 @@
+DIST cryptohash-sha1-0.11.100.1-rev6.cabal 4354 BLAKE2B f89a3045c1ea145f3ac2af440eeea2d213a69c5abaa0f9eb1407a2da34a08aabb7df966f014a9b903eff5ae9ee3262703097e6b5f5df0b13252d3889c8a2776c SHA512 3077375cbff05b415168152eeb213a9ec1c0d0d48f63b394f65399f7ae1421adc8f0e760e1ec7f7a5f83c78377151209c77d23ab01cf0ceb36e899aa000310f3
 DIST cryptohash-sha1-0.11.100.1.tar.gz 10198 BLAKE2B 5d9835feeb43a80c83de0e390d59efc908fd538ed4146ace4eb0cd67392503cf414a2324968e8249f2b506978348caa6e92c70e82c52eaa7ac14e3956388f05e SHA512 e3528c70501ffaf4649adc0fe120a0b333329761fa66505083269afa67828c16695fd91567035adef0b77915df47a6bcc99d2d90f0ecb26eda583829261cb1bc
 DIST cryptohash-sha1-0.11.101.0-rev2.cabal 3094 BLAKE2B fc048a5eaefca1df4b1748f46f48f69e7571f90fdfdb3524b7556a8b6a9b3f7b58d363209ec20d9f4892b1b3e69dc1394287e7e70e7009f06dd75bc02e267910 SHA512 1dbf660ca81c2d8633dd6255602fa6b5f2999f55400bd75391be0049ca8bcf221d14b5d294999427ed193aa0514d68e05509b85fc5a2fe9c8be574b0a0542f9a
 DIST cryptohash-sha1-0.11.101.0.tar.gz 11563 BLAKE2B 4da99b2b4943e3909d3af24f62fb0ecf4c87370075f280a7e9ea44956cd58df9f49076a0d90b60bec9a7dcb3d24df032f6b5ef07644a4b63bdf1099458996163 SHA512 4384fc2f63750400561b5dbea0a343510306d755131121346d6a52cb9420cb12fc7d20247f044beb0ea55ae254ce666edc982d76e999c0762894f405e9b6441e
--- a/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild
+++ b/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild
@@ -3,19 +3,19 @@

 EAPI=8

-# ebuild generated by hackport 0.5.1.9999
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=6

 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal

 DESCRIPTION="Fast, pure and practical SHA-1 implementation"
 HOMEPAGE="https://github.com/hvr/cryptohash-sha1"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""

 RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
@@ -29,8 +29,9 @@ DEPEND="${RDEPEND}
 "

 CABAL_CHDEPS=(
-	'base             >= 4.5   && < 4.10' 'base             >= 4.5'
+	'base             >= 4.5   && < 4.16' 'base             >= 4.5'
 	'tasty             == 0.11.*' 'tasty             >= 0.11'
 	'tasty-quickcheck  == 0.8.*' 'tasty-quickcheck  >= 0.8'
 	'tasty-hunit       == 0.9.*' 'tasty-hunit       >= 0.9'
+	'bytestring       >= 0.9.2 && < 0.11' 'bytestring >= 0.9.2'
 )
--- a/dev-haskell/cryptohash-sha1/metadata.xml
+++ b/dev-haskell/cryptohash-sha1/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="hackage">cryptohash-sha1</remote-id>
-		<remote-id type="github">haskell-hvr/cryptohash-sha1</remote-id>
+		<remote-id type="github">hvr/cryptohash-sha1</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild
+++ b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild
@@ -34,6 +34,7 @@ CABAL_CHDEPS=(
 	'tasty             == 0.11.*' 'tasty             >= 0.11'
 	'tasty-quickcheck  == 0.8.*' 'tasty-quickcheck  >= 0.8'
 	'tasty-hunit       == 0.9.*' 'tasty-hunit       >= 0.9'
+	'bytestring       >= 0.9.2 && < 0.11' 'bytestring >= 0.9.2'
 )

 src_configure() {
--- a/dev-haskell/cryptonite/cryptonite-0.28.ebuild
+++ b/dev-haskell/cryptonite/cryptonite-0.28.ebuild
@@ -21,7 +21,7 @@ IUSE="cpu_flags_x86_rdrand cpu_flags_x86_aes cpu_flags_x86_sse cpu_flags_x86_sse

 RDEPEND=">=dev-haskell/basement-0.0.6:=[profile?]
 	>=dev-haskell/memory-0.14.18:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
+	>=dev-lang/ghc-8.4.3:= <dev-lang/ghc-9.1
 	virtual/libc
 "
 DEPEND="${RDEPEND}
--- a/dev-haskell/digits/digits-0.3.1.ebuild
+++ b/dev-haskell/digits/digits-0.3.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""

-RDEPEND="dev-haskell/quickcheck:2=[profile?]
+RDEPEND="dev-haskell/quickcheck:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
--- a/dev-haskell/doctest-driver-gen/doctest-driver-gen-0.3.0.7.ebuild
+++ b/dev-haskell/doctest-driver-gen/doctest-driver-gen-0.3.0.7.ebuild
@@ -14,12 +14,16 @@ HOMEPAGE="https://github.com/Hexirp/doctest-driver-gen#readme"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+executable"
+IUSE="executable"

 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.0.7-add-executable-flag.patch"
 )

+CABAL_TEST_REQUIRED_BINS=(
+	"${PN}"
+)
+
 RDEPEND="
 	>=dev-lang/ghc-8.10.6:=
 "
@@ -32,9 +36,21 @@ DEPEND="
 "

 src_configure() {
-	local config_flags=(
-		$(cabal_flag executable executable)
-	)
+	if use executable || use test; then
+		local exe_flag=--flag=executable
+	else
+		local exe_flag=--flag=-executable
+	fi

-	haskell-cabal_src_configure "${config_flags[@]}"
+	# test-suite preprocessor needs the newly built components
+	export LD_LIBRARY_PATH="${S}/dist/build/${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	export PATH="${S}/dist/build/${PN}${PATH+:}${PATH}"
+
+	haskell-cabal_src_configure "${exe_flag}"
+}
+
+src_install() {
+	local components=( "lib:${PN}" )
+	use executable && components+=( "exe:${PN}" )
+	haskell-cabal_src_install "${components[@]}"
 }
--- a/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild
+++ b/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild
@@ -31,4 +31,5 @@ DEPEND="${RDEPEND}
 CABAL_CHDEPS=(
 	'hspec >= 2.2.3 && < 2.9' 'hspec >= 2.2.3'
 	'doctest >= 0.8 && < 0.19' 'doctest >=0.8'
+	'template-haskell >= 2.10.0.0 && < 2.18' 'template-haskell >=2.10'
 )
--- a/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild
+++ b/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild
@@ -17,7 +17,7 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="halvm"

-RDEPEND=">=dev-lang/ghc-7.10.1:=
+RDEPEND=">=dev-lang/ghc-7.10.1:= <dev-lang/ghc-9.1
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.22.2.0
--- a/dev-haskell/extra/extra-1.7.10.ebuild
+++ b/dev-haskell/extra/extra-1.7.10.ebuild
@@ -13,12 +13,20 @@ HOMEPAGE="https://github.com/ndmitchell/extra#readme"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"

 LICENSE="BSD"
-SLOT="2/${PV}"
+SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"

 RDEPEND=">=dev-haskell/clock-0.7:=[profile?]
 	>=dev-lang/ghc-8.4.3:=
 "
+
+# Tests do not work correctly on >=ghc-9.2
+RDEPEND+="
+	test? (
+		<dev-lang/ghc-9.1
+	)
+"
+
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-2.2.0.1
 	test? ( >=dev-haskell/quickcheck-2.10
--- a/dev-haskell/extra/extra-1.7.14.ebuild
+++ b/dev-haskell/extra/extra-1.7.14.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Extra functions I use"
 HOMEPAGE="https://github.com/ndmitchell/extra#readme"

 LICENSE="BSD"
-SLOT="2/${PV}"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"

 RDEPEND=">=dev-haskell/clock-0.7:=[profile?]
--- a/dev-haskell/foldl/files/foldl-1.4.15-cabal-doctest.patch
+++ b/dev-haskell/foldl/files/foldl-1.4.15-cabal-doctest.patch
@@ -0,0 +1,116 @@
+From 7dc9bf5a311c56408f5f102c09d36ab127e64b94 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@protonmail.com>
+Date: Sat, 4 Nov 2023 14:43:01 -0600
+Subject: [PATCH 1/1] Migrate to cabal-doctest
+
+doctest pulls in the out-of-scope packages if they are installed on the
+system. The best current workaround is to migrate to cabal-doctest.
+
+Bug: https://bugs.gentoo.org/916851
+Signed-off-by: hololeap <hololeap@protonmail.com>
+---
+ Setup.hs        | 17 +++++++++++++++++
+ foldl.cabal     | 13 +++++++++++--
+ test/doctest.hs | 29 +++++++++++++++++++++++++++--
+ 3 files changed, 55 insertions(+), 4 deletions(-)
+
+diff --git a/Setup.hs b/Setup.hs
+index 9a994af..f21ad76 100644
+--- a/Setup.hs
+++ b/Setup.hs
+@@ -1,2 +1,19 @@
+{-# LANGUAGE CPP #-}
+
+module Main (main) where
+
+#if MIN_VERSION_cabal_doctest(1,0,0)
+
+import Distribution.Extra.Doctest ( defaultMainWithDoctests )
+
+main :: IO ()
+main = defaultMainWithDoctests "doctest"
+
+#else
+
+ import Distribution.Simple
+
+main :: IO ()
+ main = defaultMain
+
+#endif
+diff --git a/foldl.cabal b/foldl.cabal
+index 08715aa..ec2983e 100644
+--- a/foldl.cabal
+++ b/foldl.cabal
+@@ -1,7 +1,7 @@
+ Name: foldl
+ Version: 1.4.15
+ Cabal-Version: >=1.10
+-Build-Type: Simple
+Build-Type: Custom
+ License: BSD3
+ License-File: LICENSE
+ Copyright: 2013 Gabriella Gonzalez
+@@ -21,6 +21,12 @@ Source-Repository head
+     Type: git
+     Location: https://github.com/Gabriella439/Haskell-Foldl-Library
+ 
+custom-setup
+    setup-depends:
+        base
+      , Cabal
+      , cabal-doctest >= 1.0.0
+
+ Library
+     HS-Source-Dirs: src
+     Build-Depends:
+@@ -83,6 +89,9 @@ Test-Suite doctest
+     Main-Is: doctest.hs
+     Build-Depends:
+         base,
+-        doctest >= 0.16
+        doctest >= 0.16,
+        directory,
+        filepath,
+        base-compat
+     GHC-Options: -threaded
+     Default-Language: Haskell2010
+diff --git a/test/doctest.hs b/test/doctest.hs
+index 5981eb4..847b897 100644
+--- a/test/doctest.hs
+++ b/test/doctest.hs
+@@ -1,4 +1,29 @@
+ import Test.DocTest
+import GHC.IO.Encoding (setLocaleEncoding)
+import System.Directory (getCurrentDirectory, makeAbsolute)
+import System.FilePath.Posix ((</>))
+import System.IO (utf8)
+import Build_doctests (pkgs)
+ 
+main = do
+    setLocaleEncoding utf8
+    pwd    <- getCurrentDirectory
+    prefix <- makeAbsolute pwd
+ 
+-main :: IO ()
+-main = doctest ["-isrc", "src/Control/Foldl.hs", "src/Control/Scanl.hs"]
+    let customFlags =
+            [ "-package-env=-"
+            , "-hide-all-packages"
+            , "-no-user-package-db"
+            , "-package-db=" ++ prefix </> "dist/package.conf.inplace"
+            ]
+
+    let origFlags =
+            [ "-isrc"
+            ]
+
+    let modules =
+            [ "src/Control/Foldl.hs"
+            , "src/Control/Scanl.hs"
+            ]
+
+    doctest $ customFlags ++ pkgs ++ origFlags ++ modules
+-- 
+2.41.0
+
--- a/dev-haskell/foldl/foldl-1.4.15.ebuild
+++ b/dev-haskell/foldl/foldl-1.4.15.ebuild
@@ -15,10 +15,8 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"

-PATCHES=( "${FILESDIR}/${PN}-1.4.12-cabal-doctest.patch" )
-
-GHC_BOOTSTRAP_PACKAGES=(
-	cabal-doctest
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.15-cabal-doctest.patch"
 )

 RDEPEND=">=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?]
@@ -35,5 +33,14 @@ RDEPEND=">=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-3.0.0.0
-	test? ( >=dev-haskell/doctest-0.16 )
+	test? (
+		>=dev-haskell/cabal-doctest-1.0.0
+		>=dev-haskell/doctest-0.16
+	)
 "
+
+src_configure() {
+	use test && export GHC_BOOTSTRAP_PACKAGES+=( cabal-doctest )
+
+	haskell-cabal_src_configure
+}
--- a/dev-haskell/foundation/foundation-0.0.30.ebuild
+++ b/dev-haskell/foundation/foundation-0.0.30.ebuild
@@ -14,14 +14,14 @@ HOMEPAGE="https://github.com/haskell-foundation/foundation"

 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64"
 IUSE="experimental"

 RDEPEND=">=dev-lang/ghc-8.8.1:=
 "
 DEPEND="${RDEPEND}
+	~dev-haskell/basement-0.0.16
 	>=dev-haskell/cabal-3.0.0.0
-	test? ( dev-haskell/basement )
 "

 src_configure() {
--- a/dev-haskell/generics-sop/generics-sop-0.5.1.1.ebuild
+++ b/dev-haskell/generics-sop/generics-sop-0.5.1.1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"

 RDEPEND=">=dev-haskell/sop-core-0.5.0:=[profile?] <dev-haskell/sop-core-0.5.1:=[profile?]
 	>=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
+	>=dev-lang/ghc-8.4.3:= <dev-lang/ghc-9.1
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-2.2.0.1
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 # ebuild generated by hackport 0.6.7.9999
-#hackport: flags: +splitbase -buildtests
+#hackport: flags: +splitbase,-buildtests,+minTime15

 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,13 +17,13 @@ HOMEPAGE="https://github.com/hdbc/hdbc-postgresql"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"

 LICENSE="BSD"
-SLOT="2/${PV}"
+SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""

 RDEPEND=">=dev-db/postgresql-7:*
 	dev-haskell/convertible:=[profile?]
-	>=dev-haskell/hdbc-2.2.0:2=[profile?]
+	>=dev-haskell/hdbc-2.2.0:=[profile?]
 	dev-haskell/mtl:=[profile?]
 	dev-haskell/old-locale:=[profile?]
 	dev-haskell/old-time:=[profile?]
@@ -39,10 +39,12 @@ S="${WORKDIR}/${MY_P}"

 CABAL_CHDEPS=(
 	'Cabal >= 1.8 && < 3.3' 'Cabal >= 1.8'
+	'time >= 1.5 && < 1.10' 'time >= 1.5'
 )

 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-buildtests \
-		--flag=splitbase
+		--flag=splitbase \
+		--flag=minTime15
 }
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild
@@ -19,17 +19,13 @@ HOMEPAGE="https://github.com/hdbc/hdbc-postgresql"

 LICENSE="BSD"

-# For some reason, the slot was previously set to 2. Changing this could cause
-# problems as haskell-updater tries to reinstall a version of the same slot.
-# This should be changed at some point, but currently the version in ::gentoo
-# is also set to 2.
-SLOT="2/${PV}"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"

 RDEPEND="
 	>=dev-db/postgresql-7:*
 	dev-haskell/convertible:=[profile?]
-	>=dev-haskell/hdbc-2.2.0:2=[profile?]
+	>=dev-haskell/hdbc-2.2.0:=[profile?]
 	dev-haskell/old-time:=[profile?]
 	dev-haskell/parsec:=[profile?]
 	dev-haskell/utf8-string:=[profile?]
--- a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
+++ b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+splitbase"

 RDEPEND=">=dev-db/sqlite-3.0
-	>=dev-haskell/hdbc-2.3.0.0:2=[profile?]
+	>=dev-haskell/hdbc-2.3.0.0:=[profile?]
 	dev-haskell/mtl:=[profile?]
 	dev-haskell/utf8-string:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
--- a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild
+++ b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+splitbase"

 RDEPEND=">=dev-db/sqlite-3.0
-	>=dev-haskell/hdbc-2.3.0.0:2=[profile?]
+	>=dev-haskell/hdbc-2.3.0.0:=[profile?]
 	dev-haskell/mtl:=[profile?]
 	dev-haskell/utf8-string:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
--- a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
@@ -17,12 +17,16 @@ HOMEPAGE="https://github.com/hdbc/hdbc"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"

 LICENSE="BSD"
-SLOT="2/${PV}"
+SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""

 RESTRICT="test" # Requires unmaintaned dev-haskell/testpack

+CABAL_CHDEPS=(
+	'time >= 1.5 && < 1.10' 'time >= 1.5'
+)
+
 RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?]
 	dev-haskell/mtl:=[profile?]
 	dev-haskell/old-locale:=[profile?]
@@ -36,3 +40,13 @@ DEPEND="${RDEPEND}
 "

 S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	config_flags=(
+		--flag=-buildtests
+		--flag=splitBase
+		--flag=minTime15
+	)
+
+	haskell-cabal_src_configure ${config_flags[@]}
+}
--- a/dev-haskell/hdbc/hdbc-2.4.0.4.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.4.0.4.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Haskell Database Connectivity"
 HOMEPAGE="https://github.com/hdbc/hdbc"

 LICENSE="BSD"
-SLOT="2/${PV}"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"

 PATCHES=(
--- a/dev-haskell/hedgehog/Manifest
+++ b/dev-haskell/hedgehog/Manifest
@@ -1,3 +1,3 @@
-DIST hedgehog-1.0.5.cabal 4533 BLAKE2B bca8b965bc8e6d78c0eb72ff1ad555719cc260a8744d6e52dbad8b5f6dc61cb4dcc156c8bed04e0a5eb67bfeceaf0ad23acc1c9ac2332f3d5d2ade1520e130fd SHA512 250275ecf38fb0127350539a476cf84a2db8986ef782e0be3cd321f117a003e67c5454ee7ec89a05fadad872bb6dbc4df44b8bf9a661dfb41bae10bbd24fdff2
+DIST hedgehog-1.0.5-rev1.cabal 4533 BLAKE2B bca8b965bc8e6d78c0eb72ff1ad555719cc260a8744d6e52dbad8b5f6dc61cb4dcc156c8bed04e0a5eb67bfeceaf0ad23acc1c9ac2332f3d5d2ade1520e130fd SHA512 250275ecf38fb0127350539a476cf84a2db8986ef782e0be3cd321f117a003e67c5454ee7ec89a05fadad872bb6dbc4df44b8bf9a661dfb41bae10bbd24fdff2
 DIST hedgehog-1.0.5.tar.gz 69389 BLAKE2B c3349fba40b43fbc8079fad9e1725db49bb73b2fb2c4d45fb397ec03ef9b003a49ce1a36465d7b989109b3cafec72200d2784a99ecee9e33f64534c97f8c78ca SHA512 03a1bd64451ce90ce7bac67e9f558a97b33cb2f7eeec7885c76558f34018eb794f82344563c6b511094e9cf610a6c0f4c0a229455e57df8729fc093ec212dd98
 DIST hedgehog-1.4.tar.gz 77762 BLAKE2B 44b8cc3db1f9cb2b833fa71cbcdb9398456a82a66682985be304bcae0f8def5e1f2587abbd27e708fc15d38117e237fef797014294491272503ef018b566acf6 SHA512 2c91d0bab1f06996ea68e2823d7e2105da616329ba3bb967b230fe018e113ee40a40996a60641084c8f5390743fc002a36670620cfa7068ff594bdd28e4b1a9a
--- a/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild
+++ b/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild
@@ -3,35 +3,35 @@

 EAPI=8

-# ebuild generated by hackport 0.7.9999
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1

 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal

 DESCRIPTION="Release with confidence"
 HOMEPAGE="https://hedgehog.qa"
-HACKAGE_REV="1"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
-	https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"

 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"

+CABAL_CHDEPS=(
+	'template-haskell                >= 2.10       && < 2.18' 'template-haskell >=2.10'
+)
+
 RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.12:=[profile?]
 	>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?]
 	>=dev-haskell/concurrent-output-1.7:=[profile?] <dev-haskell/concurrent-output-1.11:=[profile?]
 	>=dev-haskell/erf-2.0:=[profile?] <dev-haskell/erf-2.1:=[profile?]
-	>=dev-haskell/exceptions-0.7:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
 	>=dev-haskell/lifted-async-0.7:=[profile?] <dev-haskell/lifted-async-0.11:=[profile?]
 	>=dev-haskell/mmorph-1.0:=[profile?] <dev-haskell/mmorph-1.2:=[profile?]
 	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
 	>=dev-haskell/pretty-show-1.6:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?]
 	>=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
 	>=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3:=[profile?]
 	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
-	>=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?]
 	>=dev-haskell/text-1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
 	>=dev-haskell/transformers-base-0.4.5.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
 	>=dev-haskell/wl-pprint-annotated-0.0:=[profile?] <dev-haskell/wl-pprint-annotated-0.2:=[profile?]
@@ -40,11 +40,3 @@ RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-2.2.0.1
 "
-
-src_prepare() {
-	# pull revised cabal from upstream
-	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
-
-	# Apply patches *after* pulling the revised cabal
-	default
-}
--- a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
+++ b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
@@ -19,6 +19,10 @@ IUSE=""

 RESTRICT=test # Requires network access?

+CABAL_CHDEPS=(
+	'bytestring              == 0.10.*' 'bytestring >= 0.10'
+)
+
 RDEPEND=">=dev-haskell/language-javascript-0.6:=[profile?] <dev-haskell/language-javascript-0.8:=[profile?]
 	>=dev-haskell/optparse-applicative-0.7:=[profile?]
 	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
--- a/dev-haskell/hourglass/hourglass-0.2.12.ebuild
+++ b/dev-haskell/hourglass/hourglass-0.2.12.ebuild
@@ -17,7 +17,7 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""

-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-7.4.1:= <dev-lang/ghc-9.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
--- a/dev-haskell/hspec-core/hspec-core-2.10.6.ebuild
+++ b/dev-haskell/hspec-core/hspec-core-2.10.6.ebuild
@@ -19,7 +19,7 @@ RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
 	>=dev-haskell/call-stack-0.2.0:=[profile?]
 	>=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
 	>=dev-haskell/hunit-1.6:=[profile?] <dev-haskell/hunit-1.7:=[profile?]
-	>=dev-haskell/quickcheck-2.13.1:2=[profile?]
+	>=dev-haskell/quickcheck-2.13.1:=[profile?]
 	>=dev-haskell/quickcheck-io-0.2.0:=[profile?]
 	dev-haskell/random:=[profile?]
 	dev-haskell/setenv:=[profile?]
--- a/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild
+++ b/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild
@@ -22,7 +22,7 @@ RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
 	>=dev-haskell/clock-0.7.1:=[profile?]
 	>=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
 	>=dev-haskell/hunit-1.6:=[profile?] <dev-haskell/hunit-1.7:=[profile?]
-	>=dev-haskell/quickcheck-2.13.1:2=[profile?]
+	>=dev-haskell/quickcheck-2.13.1:=[profile?]
 	>=dev-haskell/quickcheck-io-0.2.0:=[profile?]
 	dev-haskell/random:=[profile?]
 	dev-haskell/setenv:=[profile?]
--- a/dev-haskell/hspec-meta/hspec-meta-2.10.5.ebuild
+++ b/dev-haskell/hspec-meta/hspec-meta-2.10.5.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 RDEPEND="dev-haskell/ansi-terminal:=[profile?]
 	dev-haskell/call-stack:=[profile?]
 	dev-haskell/clock:=[profile?]
-	>=dev-haskell/quickcheck-2.12:2=[profile?]
+	>=dev-haskell/quickcheck-2.12:=[profile?]
 	dev-haskell/quickcheck-io:=[profile?]
 	dev-haskell/random:=[profile?]
 	dev-haskell/setenv:=[profile?]
--- a/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild
+++ b/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 RDEPEND="dev-haskell/ansi-terminal:=[profile?]
 	dev-haskell/call-stack:=[profile?]
 	dev-haskell/clock:=[profile?]
-	>=dev-haskell/quickcheck-2.12:2=[profile?]
+	>=dev-haskell/quickcheck-2.12:=[profile?]
 	dev-haskell/quickcheck-io:=[profile?]
 	dev-haskell/random:=[profile?]
 	dev-haskell/setenv:=[profile?]
--- a/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild
+++ b/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild
@@ -22,11 +22,11 @@ RDEPEND="dev-haskell/base-compat:=[profile?]
 	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
 	>=dev-haskell/hspec-expectations-0.8.0:=[profile?]
 	dev-haskell/http-types:=[profile?]
-	dev-haskell/quickcheck:2=[profile?]
+	dev-haskell/quickcheck:=[profile?]
 	dev-haskell/text:=[profile?]
 	>=dev-haskell/wai-3:=[profile?]
 	>=dev-haskell/wai-extra-3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-7.8.2:= <dev-lang/ghc-9.1
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
--- a/dev-haskell/hspec-wai/hspec-wai-0.11.1.ebuild
+++ b/dev-haskell/hspec-wai/hspec-wai-0.11.1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="dev-haskell/base-compat:=[profile?]
 	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
 	>=dev-haskell/hspec-expectations-0.8.0:=[profile?]
 	dev-haskell/http-types:=[profile?]
-	dev-haskell/quickcheck:2=[profile?]
+	dev-haskell/quickcheck:=[profile?]
 	dev-haskell/text:=[profile?]
 	>=dev-haskell/wai-3:=[profile?]
 	>=dev-haskell/wai-extra-3:=[profile?]
--- a/dev-haskell/hspec/hspec-2.10.6.ebuild
+++ b/dev-haskell/hspec/hspec-2.10.6.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 RDEPEND="~dev-haskell/hspec-core-2.10.6:=[profile?]
 	~dev-haskell/hspec-discover-2.10.6:=[profile?]
 	>=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
-	>=dev-haskell/quickcheck-2.12:2=[profile?]
+	>=dev-haskell/quickcheck-2.12:=[profile?]
 	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
--- a/dev-haskell/hspec/hspec-2.9.4.ebuild
+++ b/dev-haskell/hspec/hspec-2.9.4.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 RDEPEND="~dev-haskell/hspec-core-2.9.4:=[profile?]
 	~dev-haskell/hspec-discover-2.9.4:=[profile?]
 	>=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
-	>=dev-haskell/quickcheck-2.12:2=[profile?]
+	>=dev-haskell/quickcheck-2.12:=[profile?]
 	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
--- a/dev-haskell/hsyaml/Manifest
+++ b/dev-haskell/hsyaml/Manifest
@@ -1,2 +1,3 @@
-DIST HsYAML-0.2.1.0.tar.gz 83976 BLAKE2B fff32d30eb6cb76c852c9cb1909b8be06e4818d23322397271594dfe60895ea79ffa8cc4c4944173de30d46e1ef8a2872972434aeacec44fff8d52dc169264e5 SHA512 f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304
+DIST hsyaml-0.2.1.0-rev4.cabal 5397 BLAKE2B 66c3351dd9d89684d17c48aa7efbf6d49e422ce20f5537712fc13ea454f675cd70aca8657695075de8b75bfed1f27de6fb351abc35854535fb1972f54d2fe31e SHA512 abbcd42b604b11ad1758f85f6de732b65fc21f1d08d5855569cce6d52b7ca26c88431bcec640031b7209c768bd5902d401039f52ffd31b857616298000697ffc
+DIST hsyaml-0.2.1.0.tar.gz 83976 BLAKE2B fff32d30eb6cb76c852c9cb1909b8be06e4818d23322397271594dfe60895ea79ffa8cc4c4944173de30d46e1ef8a2872972434aeacec44fff8d52dc169264e5 SHA512 f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304
 DIST hsyaml-0.2.1.2.tar.gz 84263 BLAKE2B 1fb534a31cdcc41536e3f0114f27b4f140142293aca052d72d5d5993ff5ff686fea30a893e30efe34c2969ad9237228a43960f8adac201470568628d60464237 SHA512 4ade814924422a0985096be48ce0305f8491df03985511b408fefcf68a044f9ec4a0d29d978c2bb72b36315c49ee3faea69d8336cd5d88ca3d2d86077f46d003
--- a/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild
+++ b/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild
@@ -3,20 +3,20 @@

 EAPI=8

+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=4
+CABAL_PN="HsYAML"
+
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal

-MY_PN="HsYAML"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pure Haskell YAML 1.2 parser"
-HOMEPAGE="https://github.com/haskell-hvr/HsYAML"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+DESCRIPTION="Pure Haskell YAML 1.2 processor"
+HOMEPAGE="https://github.com/hvr/HsYAML"

 LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""

 RDEPEND=">=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
 	>=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
@@ -27,17 +27,11 @@ RDEPEND=">=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.14
-	test? ( >=dev-haskell/quickcheck-2.13:2=
+	test? ( >=dev-haskell/quickcheck-2.13:=
 		>=dev-haskell/tasty-1.2:=
 		>=dev-haskell/tasty-quickcheck-0.10:= )
 "

-S="${WORKDIR}/${MY_P}"
-
-CABAL_CHDEPS=(
-	'base         >=4.5   && <4.14' 'base         >=4.5'
-	'containers   >=0.4.2 && <0.7' 'containers   >=0.4.2'
-	'QuickCheck == 2.13.*' 'QuickCheck >= 2.13'
-	'tasty == 1.2.*' 'tasty >= 1.2'
-	'tasty-quickcheck == 0.10.*' 'tasty-quickcheck >= 0.10'
-)
+src_configure() {
+	haskell-cabal_src_configure --flag=-exe
+}
--- a/dev-haskell/hsyaml/metadata.xml
+++ b/dev-haskell/hsyaml/metadata.xml
@@ -10,6 +10,6 @@
 	</use>
 	<upstream>
 		<remote-id type="hackage">HsYAML</remote-id>
-		<remote-id type="github">haskell-hvr/HsYAML</remote-id>
+		<remote-id type="github">hvr/HsYAML</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-haskell/http-date/http-date-0.0.8.ebuild
+++ b/dev-haskell/http-date/http-date-0.0.8.ebuild
@@ -20,7 +20,7 @@ IUSE=""
 RESTRICT=test # Ambiguous module name ‘Data.Time’: it was found in multiple packages: pulseaudio-0.0.2.1 time-1.8.0.2

 RDEPEND="dev-haskell/attoparsec:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.4.1:= <dev-lang/ghc-9.1
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
--- a/dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.ebuild
+++ b/dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.ebuild
@@ -16,6 +16,10 @@ LICENSE="BSD-2"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"

+CABAL_CHDEPS=(
+	'base                  >=4.5      && <4.16' 'base >=4.5'
+)
+
 RDEPEND=">=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
 	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
 	>=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
--- a/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild
+++ b/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild
@@ -20,6 +20,10 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="mmap"

+CABAL_CHDEPS=(
+	'bytestring          >= 0.9     && < 0.11' 'bytestring >=0.9'
+)
+
 RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
 	>=dev-haskell/primitive-0.4:=[profile?]
 	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
--- a/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild
+++ b/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=
 	>=dev-haskell/safe-exceptions-0.1:=[profile?] <dev-haskell/safe-exceptions-0.2:=[profile?]
 	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?]
 	>=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
+	>=dev-lang/ghc-8.0.1:= <dev-lang/ghc-9.1
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.24.0.0
--- a/dev-haskell/lifted-async/Manifest
+++ b/dev-haskell/lifted-async/Manifest
@@ -1,2 +1,3 @@
+DIST lifted-async-0.10.2-rev1.cabal 2808 BLAKE2B 62913bfee810304bbd37548ec130dce6b21412497efc055043aaa49ea5d1c2736fb393583783a8c56888e86a2da346165f6352082f7f69b967e08fcb5cd92c73 SHA512 bc9d4310dc1655eb048c68f6a445644ca5a495627bd733b1af4eecabb751ac60598ee68360281464c46c56bd94a6e3ade2abbc18966b11d7bde9135ab4c06136
 DIST lifted-async-0.10.2.3.tar.gz 10685 BLAKE2B 86699670329fe040f1dab3eef317ba717fdfb7c6e69a444190a270280c90e5a59f54378f61d77c63175b06f41bb63100e98e5034d8d4a7df92c4af17fac37293 SHA512 b21ab3ccf04de748d3b0bf0ca8ae2c490fdfad4bcc5b9053a196da424923866d58bb735bc208ca600ae2d4d1d66545adc52e0826ba6bb63a7089d4946493e59a
 DIST lifted-async-0.10.2.tar.gz 10607 BLAKE2B 79ef9e4f11e5d41d3886473f2443a7345a1b52fd0aaf50a96a338f3958fdfef0a00846adf04cf8d310935c130a583544829685ad895c238544fd3ca5558973cd SHA512 eb2b33693ab1617fdeca934c6ede73c530e578425049804c3a0322a63b5262411453f80cb730dabd338590fc6b3093cd13872b9922f5cda4806741fc74ea63ee
--- a/dev-haskell/lifted-async/lifted-async-0.10.2.ebuild
+++ b/dev-haskell/lifted-async/lifted-async-0.10.2.ebuild
@@ -3,30 +3,34 @@

 EAPI=8

-# ebuild generated by hackport 0.6.7.9999
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1

 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal

 DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
 HOMEPAGE="https://github.com/maoe/lifted-async"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"

+CABAL_CHDEPS=(
+	'base >= 4.5 && < 4.16' 'base >= 4.5'
+)
+
 RDEPEND=">=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
 	>=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.14:=[profile?]
 	>=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
 	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
 	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
+	>=dev-lang/ghc-9.0.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
+	>=dev-haskell/cabal-3.4.1.0
 	test? ( dev-haskell/hunit
-		dev-haskell/mtl
 		dev-haskell/tasty
 		<dev-haskell/tasty-expected-failure-0.13
 		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
--- a/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.1.ebuild
+++ b/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"

 RDEPEND=">=dev-haskell/lua-2.0:=[profile?] <dev-haskell/lua-2.4:=[profile?]
-	>=dev-haskell/quickcheck-2.7:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
+	>=dev-haskell/quickcheck-2.7:=[profile?] <dev-haskell/quickcheck-3:=[profile?]
 	>=dev-lang/ghc-8.8.1:=
 "
 DEPEND="${RDEPEND}
--- a/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.ebuild
+++ b/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"

 RDEPEND=">=dev-haskell/lua-2.0:=[profile?] <dev-haskell/lua-2.3:=[profile?]
-	>=dev-haskell/quickcheck-2.7:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
+	>=dev-haskell/quickcheck-2.7:=[profile?] <dev-haskell/quickcheck-3:=[profile?]
 	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
--- a/dev-haskell/megaparsec-tests/megaparsec-tests-9.2.2.ebuild
+++ b/dev-haskell/megaparsec-tests/megaparsec-tests-9.2.2.ebuild
@@ -20,7 +20,7 @@ RDEPEND=">=dev-haskell/hspec-2.0:=[profile?] <dev-haskell/hspec-3.0:=[profile?]
 	>=dev-haskell/hspec-expectations-0.8:=[profile?] <dev-haskell/hspec-expectations-0.9:=[profile?]
 	>=dev-haskell/hspec-megaparsec-2.0:=[profile?] <dev-haskell/hspec-megaparsec-3.0:=[profile?]
 	~dev-haskell/megaparsec-9.2.2:=[profile?]
-	>=dev-haskell/quickcheck-2.10:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
+	>=dev-haskell/quickcheck-2.10:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
 	>=dev-lang/ghc-9.0.2:=
 "
 DEPEND="${RDEPEND}
--- a/dev-haskell/memory/memory-0.15.0-r1.ebuild
+++ b/dev-haskell/memory/memory-0.15.0-r1.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""

 RDEPEND=">=dev-haskell/basement-0.0.7:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
+	>=dev-lang/ghc-8.0.1:= <dev-lang/ghc-9.1
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.24.0.0
--- a/dev-haskell/missingh/Manifest
+++ b/dev-haskell/missingh/Manifest
@@ -1,2 +1,3 @@
-DIST MissingH-1.4.3.0.tar.gz 107358 BLAKE2B fa6cf7efd1a60defce6ec0e6bbee229b71f5afe4140cca31dd47c54fbeb8a2a7b0f3e41e4ccba3e010ab85c21fad4d9bb392bd4481a01a945a77de7366b6eae6 SHA512 eb42ad9fd09347d2ec661f8181c6d2c95fb4f9f05634373ac27b377508056afd909b4925f725b9e11441ee9877b66b46038005e469d0b754f8f6cb1cda66d1dc
+DIST missingh-1.4.3.0-rev2.cabal 4702 BLAKE2B bfdab0fa3c9b7ca3fffe3cfa0b8407b6846253a6088e229b444a28c965054a1107f2553ebc4b5907a350a53280a675eb503a43fee6a5ebba4617c7469f28b04c SHA512 62b58dcef890121fa58b89741ea1704cdde6195f67ded1d8e4d891b2d39a2287fe71c37bfca15b7c23debb98b5b7e6405dc0afc4cf63c8a025189832186de0aa
+DIST missingh-1.4.3.0.tar.gz 107358 BLAKE2B fa6cf7efd1a60defce6ec0e6bbee229b71f5afe4140cca31dd47c54fbeb8a2a7b0f3e41e4ccba3e010ab85c21fad4d9bb392bd4481a01a945a77de7366b6eae6 SHA512 eb42ad9fd09347d2ec661f8181c6d2c95fb4f9f05634373ac27b377508056afd909b4925f725b9e11441ee9877b66b46038005e469d0b754f8f6cb1cda66d1dc
 DIST missingh-1.6.0.0.tar.gz 109652 BLAKE2B ff7faa78c0d48108da83ead5bfa8a137270b3c1c520dfca683923d05b1c14ba581b49e6e713535ea6a596684d5ef55ed54ae8cbd9a8605ce3fd4b2dccda5dafe SHA512 f49cf93bf172e5ed41a05af4d12d05d6b2dcde61a94b42f2f8be2931458ed622af45051c02a30f71d8ce359548b13d1a7afcd7b458b4a68e78896014a33923a0
--- a/dev-haskell/missingh/metadata.xml
+++ b/dev-haskell/missingh/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="hackage">MissingH</remote-id>
-		<remote-id type="github">haskell-hvr/missingh</remote-id>
+		<remote-id type="github">hvr/missingh</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
+++ b/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
@@ -3,18 +3,17 @@

 EAPI=8

-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: +network--ge-3-0-0
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +network--ge-3_0_0
+
+CABAL_HACKAGE_REVISION=2
+CABAL_PN="MissingH"

 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal

-MY_PN="MissingH"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="Large utility library"
 HOMEPAGE="https://hackage.haskell.org/package/MissingH"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"

 LICENSE="BSD"
 SLOT="0/${PV}"
@@ -39,13 +38,6 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 )
 "

-S="${WORKDIR}/${MY_P}"
-
-CABAL_CHDEPS=(
-	'base                >= 4.5.0.0 && < 4.15' 'base                >= 4.5.0.0'
-	'random              >= 1.0.1.1 && < 1.2' 'random'
-)
-
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=network--ge-3_0_0
--- a/dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild
+++ b/dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="dev-haskell/hashable:=[profile?]
 	>=dev-haskell/unordered-containers-0.2:=[profile?]
 	>=dev-haskell/vector-0.10:=[profile?]
 	>=dev-haskell/vector-algorithms-0.6:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
+	>=dev-lang/ghc-8.2.1:= <dev-lang/ghc-9.1
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-2.0.0.2
--- a/dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild
+++ b/dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild
@@ -17,7 +17,7 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"

 RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
-	>=dev-haskell/quickcheck-2.10:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
+	>=dev-haskell/quickcheck-2.10:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
 	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
 	>=dev-lang/ghc-8.4.3:=
 "
--- a/dev-haskell/pandoc-types/pandoc-types-1.23.1.ebuild
+++ b/dev-haskell/pandoc-types/pandoc-types-1.23.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"

 RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-2.3:=[profile?]
-	>=dev-haskell/quickcheck-2.10:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
+	>=dev-haskell/quickcheck-2.10:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
 	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
 	dev-haskell/text:=[profile?]
 	>=dev-lang/ghc-8.8.1:=
--- a/dev-haskell/parallel/parallel-3.2.2.0.ebuild
+++ b/dev-haskell/parallel/parallel-3.2.2.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://hackage.haskell.org/package/parallel"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"

 LICENSE="BSD"
-SLOT="3/${PV}"
+SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""

--- a/dev-haskell/parsec/parsec-3.1.14.0-r2.ebuild
+++ b/dev-haskell/parsec/parsec-3.1.14.0-r2.ebuild
@@ -23,6 +23,10 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"

 RESTRICT=test # circular dependencies: dev-haskell/base-orphans->cabal->parsec[test]->test-framework-hunit->test-framework->base-orphans

+CABAL_CHDEPS=(
+	'base       >= 4.5.0   && < 4.16' 'base >= 4.5.0'
+)
+
 RDEPEND="
 	>=dev-lang/ghc-8.10.6:=
 "
--- a/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild
+++ b/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild
@@ -26,7 +26,7 @@ RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
 	>=dev-haskell/monad-logger-0.3.25:=[profile?]
 	>=dev-haskell/path-pieces-0.2:=[profile?]
 	>=dev-haskell/persistent-2.14:=[profile?] <dev-haskell/persistent-2.15:=[profile?]
-	>=dev-haskell/quickcheck-2.9:2=[profile?]
+	>=dev-haskell/quickcheck-2.9:=[profile?]
 	>=dev-haskell/quickcheck-instances-0.3:=[profile?]
 	>=dev-haskell/random-1.1:=[profile?]
 	>=dev-haskell/resourcet-1.1:=[profile?]
--- a/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.2.0.ebuild
+++ b/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.2.0.ebuild
@@ -19,9 +19,9 @@ IUSE="+binary-laws +unary-laws"

 RDEPEND="dev-haskell/contravariant:=[profile?]
 	>=dev-lang/ghc-8.4.3:=
-	binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
-	unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
-	!unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) )
+	binary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] )
+	unary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] )
+	!unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:=[profile?] ) )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-2.4
--- a/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild
+++ b/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild
@@ -28,11 +28,11 @@ RDEPEND=">=dev-haskell/base-orphans-0.1:=[profile?]
 	dev-haskell/tagged:=[profile?]
 	>=dev-lang/ghc-8.0.1:=
 	aeson? ( >=dev-haskell/aeson-0.9:=[profile?] )
-	binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
+	binary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] )
 	semigroupoids? ( dev-haskell/semigroupoids:=[profile?] )
 	semirings? ( >=dev-haskell/semirings-0.4.2:=[profile?] )
-	unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
-	!unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) )
+	unary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] )
+	!unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:=[profile?] ) )
 	vector? ( >=dev-haskell/vector-0.12:=[profile?] )
 "
 DEPEND="${RDEPEND}
--- a/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.5.0.ebuild
+++ b/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.5.0.ebuild
@@ -22,11 +22,11 @@ RDEPEND=">=dev-haskell/primitive-0.6.4:=[profile?] <dev-haskell/primitive-0.8:=[
 	>=dev-haskell/quickcheck-classes-base-0.6.2:=[profile?] <dev-haskell/quickcheck-classes-base-0.7:=[profile?]
 	>=dev-lang/ghc-8.4.3:=
 	aeson? ( >=dev-haskell/aeson-0.9:=[profile?] )
-	binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
+	binary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] )
 	semigroupoids? ( dev-haskell/semigroupoids:=[profile?] )
 	semirings? ( >=dev-haskell/semirings-0.4.2:=[profile?] )
-	unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
-	!unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) )
+	unary-laws? ( >=dev-haskell/quickcheck-2.10.0:=[profile?] )
+	!unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:=[profile?] ) )
 	vector? ( >=dev-haskell/vector-0.12:=[profile?] )
 "
 DEPEND="${RDEPEND}
--- a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild
+++ b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild
@@ -24,7 +24,7 @@ RDEPEND=">=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-in
 	>=dev-haskell/integer-logarithms-1.0.3:=[profile?] <dev-haskell/integer-logarithms-1.1:=[profile?]
 	>=dev-haskell/old-time-1.1.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
 	>=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.4:=[profile?]
-	>=dev-haskell/quickcheck-2.14.1:2=[profile?] <dev-haskell/quickcheck-2.14.3:2=[profile?]
+	>=dev-haskell/quickcheck-2.14.1:=[profile?] <dev-haskell/quickcheck-2.14.3:=[profile?]
 	>=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
 	>=dev-haskell/splitmix-0.0.2:=[profile?] <dev-haskell/splitmix-0.2:=[profile?]
 	>=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.5:=[profile?]
--- a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.29.1-r1.ebuild
+++ b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.29.1-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND=">=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-in
 	>=dev-haskell/old-time-1.1.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
 	>=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.5:=[profile?]
 	>=dev-haskell/primitive-0.6.4.0:=[profile?] <dev-haskell/primitive-0.9:=[profile?]
-	>=dev-haskell/quickcheck-2.14.1:2=[profile?] <dev-haskell/quickcheck-2.14.4:2=[profile?]
+	>=dev-haskell/quickcheck-2.14.1:=[profile?] <dev-haskell/quickcheck-2.14.4:=[profile?]
 	>=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
 	>=dev-haskell/splitmix-0.0.2:=[profile?] <dev-haskell/splitmix-0.2:=[profile?]
 	>=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.6:=[profile?]
--- a/dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild
+++ b/dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""

 RDEPEND=">=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.7:2=[profile?]
+	>=dev-haskell/quickcheck-2.7:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
--- a/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.1.0.ebuild
+++ b/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.1.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="BSD-2"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"

-RDEPEND=">=dev-haskell/quickcheck-2.7:2=[profile?]
+RDEPEND=">=dev-haskell/quickcheck-2.7:=[profile?]
 	>=dev-lang/ghc-8.10.6:=
 "
 DEPEND="${RDEPEND}
--- a/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/nick8325/quickcheck"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"

 LICENSE="BSD"
-SLOT="2/${PV}"
+SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="+template-haskell"

--- a/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Automatic testing of Haskell programs"
 HOMEPAGE="https://github.com/nick8325/quickcheck"

 LICENSE="BSD"
-SLOT="2/${PV}"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
 IUSE="+template-haskell"

--- a/dev-haskell/reducers/reducers-3.12.3-r1.ebuild
+++ b/dev-haskell/reducers/reducers-3.12.3-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[
 	>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
 	>=dev-haskell/text-0.11.1.5:=[profile?] <dev-haskell/text-1.3:=[profile?]
 	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-7.8.2:= <dev-lang/ghc-9.1
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
--- a/dev-haskell/regex-base/Manifest
+++ b/dev-haskell/regex-base/Manifest
@@ -1,3 +1,4 @@
+DIST regex-base-0.94.0.1-rev1.cabal 2608 BLAKE2B 2bdd9416441c197db9f5114099ffb5d21d803aa3e120c536d56a9ef52ee016c547ff57ef350b72a4db2fe5f501f09ae6fe50567973a639266ff2b3a98e642aa4 SHA512 0f416380b81d353bd60990317d97d73aa4831321c1048da099ed8c612a2b7a4327d785ccd76d4cd65abc416c3f1d9fe6c062fe07eca61e847c6f4104c2e34d57
 DIST regex-base-0.94.0.1.tar.gz 10095 BLAKE2B 89dd1bf850c072ba8b0283e363415f82bd47557590161e6a65c3a570ff01042b63f85361b4910bba50e8ddbc64887ebf249d8e9b1d60f954d03dad1f29965b93 SHA512 2a1f088532c4488e4dea417222b8723436fbffcf8a8a3596d66c5fd4941250e97c0271c23025244ef3f4ba5295cff82ad8b49a6776d9410210efa7f199bc8b7e
 DIST regex-base-0.94.0.2-rev1.cabal 2643 BLAKE2B 707879e0ddb6cccdad35b034b14b45438fd3d72598f287441bf37ea0c8e756975b447123c160b107633119d0a55f4b758c69fe130038a901263ea952fcd0cfe6 SHA512 e55e3e199035f3271b687463a60423cdbb1814b55a8669c3b49f97b8935825b3527ab527e016ac0ee3a009bbae64160f74568d803cb0d65a065294e236bfb2a3
 DIST regex-base-0.94.0.2.tar.gz 10488 BLAKE2B c401e66232c402ebc8d3ea2b3cba42caa8297951af43a9bc1a2c8a59e4d7d12ae96b17ca56db3cc187227478cf97664d38869a062d77d6883bcde1ffb31fb202 SHA512 cef8177c35b98f31a12044033dca95b767df593c6830d253cee6e31677c99a5cebf67d6e64f24ec9ba736e36256e9da3bfbe66e2ac8450582d36a4c5cad25c88
--- a/dev-haskell/regex-base/metadata.xml
+++ b/dev-haskell/regex-base/metadata.xml
@@ -5,4 +5,8 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">regex-base</remote-id>
+		<remote-id type="github">hvr/regex-base</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild
+++ b/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild
@@ -3,14 +3,15 @@

 EAPI=8

-# ebuild generated by hackport 0.6.7.9999
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1

 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal

 DESCRIPTION="Common \"Text.Regex.*\" API for Regex matching"
 HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0/${PV}"
--- a/dev-haskell/regex-posix/Manifest
+++ b/dev-haskell/regex-posix/Manifest
@@ -1,3 +1,4 @@
+DIST regex-posix-0.96.0.0-rev2.cabal 2861 BLAKE2B 593fde1c9acd274a1e813aa7013ac7f085696156ad216b56c578b05a241d37713b635244bba6c2347d538995669d9ccf92325129a40d8e15c008118059aa1a65 SHA512 6b5fe50e2d9ec0dbdcdec5362c97beb8a80d3d9e9c0a95f766181f49b080d231ae5802d48efd02d8ab006e48354e32b9ea209adb4fb4ef7efb9736ca7aeca7d6
 DIST regex-posix-0.96.0.0.tar.gz 12529 BLAKE2B e949fd28a8fee8c0ae056dc0037dc9eb03b3814145740a053752ac121f6ffc60bad5db72832626340f0f201d06ccc649225af9506be671f63fd5b850e20bda6c SHA512 91bdc672a535cd1a6a65b1ae2adef43605b792ec9f99150fa239ab4353cddad47988ac7baa65673c53be36e83c8fad1511ba85fb5f7b43c51b4ae526d9af248a
 DIST regex-posix-0.96.0.1-rev1.cabal 2954 BLAKE2B e53df5885439c8e29cc562a5bbbcbb9434b72ee3c0abba83e5b1a1cbb5f39b1fa002585bbb1d70b3cad5c88ea4b83c4767799bbafed35d7f32fc658c98a53042 SHA512 d8720a871133a1cd8388474766889fd560686a941eef845202fe45c2191908ec444bc93b423e763d183dda2ed06f1cd3c3c44ee846dd01f288dfc4d9832835d0
 DIST regex-posix-0.96.0.1.tar.gz 12853 BLAKE2B 8b01c71287cd4477f6fdc11eae0a2447efc39ee538313713de8e851430bb480c56c011389748b113d2ae8b0ec8f6f8306ded2bbfed2226ff3c172fa7a2eb0241 SHA512 4d6383e34fd6144af3004caee70bc83c8894c8e78c147c2e829cdbd9c74af3d1807604db0927554aea20c69a8b5c1eb3dd01d3963b2e615ee39beaa48095125b
--- a/dev-haskell/regex-posix/metadata.xml
+++ b/dev-haskell/regex-posix/metadata.xml
@@ -5,4 +5,9 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">regex-posix</remote-id>
+		<remote-id type="github">hvr/regex-base</remote-id>
+		<remote-id type="github">hvr/regex-posix</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild
+++ b/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild
@@ -3,20 +3,20 @@

 EAPI=8

-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.8.4.0.9999
 #hackport: flags: +newbase,+splitbase,-_regex-posix-clib

+CABAL_HACKAGE_REVISION=2
+
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal

 DESCRIPTION="Replaces/Enhances Text.Regex"
 HOMEPAGE="https://hackage.haskell.org/package/regex-posix"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""

 RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
 	>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 "

 CABAL_CHDEPS=(
-	'base       >= 4.3 && < 4.14' 'base       >= 4.3'
+	'base       >= 4.3 && < 4.16' 'base >= 4.3'
 )

 src_configure() {
--- a/dev-haskell/servant/servant-0.19.ebuild
+++ b/dev-haskell/servant/servant-0.19.ebuild
@@ -33,7 +33,7 @@ RDEPEND=">=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-3:=[profile?
 	>=dev-haskell/http-types-0.12.2:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
 	>=dev-haskell/mmorph-1.1.2:=[profile?] <dev-haskell/mmorph-1.3:=[profile?]
 	>=dev-haskell/network-uri-2.6.1.0:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
-	>=dev-haskell/quickcheck-2.12.6.1:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
+	>=dev-haskell/quickcheck-2.12.6.1:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
 	>=dev-haskell/singleton-bool-0.1.4:=[profile?] <dev-haskell/singleton-bool-0.1.7:=[profile?]
 	>=dev-haskell/sop-core-0.4.0.0:=[profile?] <dev-haskell/sop-core-0.6:=[profile?]
 	>=dev-haskell/string-conversions-0.4.0.1:=[profile?] <dev-haskell/string-conversions-0.5:=[profile?]
--- a/dev-haskell/servant/servant-0.20.ebuild
+++ b/dev-haskell/servant/servant-0.20.ebuild
@@ -28,7 +28,7 @@ RDEPEND=">=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-3:=[profile?
 	>=dev-haskell/http-types-0.12.2:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
 	>=dev-haskell/mmorph-1.1.2:=[profile?] <dev-haskell/mmorph-1.3:=[profile?]
 	>=dev-haskell/network-uri-2.6.1.0:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
-	>=dev-haskell/quickcheck-2.12.6.1:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
+	>=dev-haskell/quickcheck-2.12.6.1:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
 	>=dev-haskell/singleton-bool-0.1.4:=[profile?] <dev-haskell/singleton-bool-0.2:=[profile?]
 	>=dev-haskell/sop-core-0.4.0.0:=[profile?] <dev-haskell/sop-core-0.6:=[profile?]
 	>=dev-haskell/string-conversions-0.4.0.1:=[profile?] <dev-haskell/string-conversions-0.5:=[profile?]
--- a/dev-haskell/shelly/Manifest
+++ b/dev-haskell/shelly/Manifest
@@ -1,2 +1,3 @@
 DIST shelly-1.12.1.tar.gz 75543 BLAKE2B db34e1a5e708192458e5d228b4758aa26812a3f547e39981754f8e3bb7af521c3887fde8e1b859a69b82edafc70be9979af30c918232a15e842f4e9894ed54ee SHA512 3917a03a23e61d5618f897f0ee90a4823980239252f260312ca86c7b364459c58749400e50a0f2ab78822c2eb6283891f993d2f31f0048a3cece19d5c565f05f
+DIST shelly-1.9.0-rev3.cabal 5393 BLAKE2B de11c00ff84352212cbc1d0a238c71686feb10fbe503b0eeda3912c50693d756499b75c779d637a2a171cf15b92a518ce51821c46b72d2dc6af78f513b6a3679 SHA512 f7ebde25f2132b0e4658467001b667f9b6239a609120177312fc849ae60c00d1dabea73c4c3596fe034eb318200004b225757ab095a20ebc98a0cdd678d96a97
 DIST shelly-1.9.0.tar.gz 73344 BLAKE2B f12e8835be5dd648427ff92b73bc9a37215a47067e65456c4c3dc8e9c2e5bb610da171648aadf9759e9a91eb075fa74d06241f83977a5380f49bc861643707cc SHA512 7c1eb25439e08095187746d0101fd92ad56ebb5a706820bad7330667cfc806066d4675c677e5d267440d4af7b517f36449e8f5e75332521780b564edc1586254
--- a/dev-haskell/shelly/metadata.xml
+++ b/dev-haskell/shelly/metadata.xml
@@ -10,6 +10,6 @@
 	</use>
 	<upstream>
 		<remote-id type="hackage">shelly</remote-id>
-		<remote-id type="github">gregwebs/Shelly.hs</remote-id>
+		<remote-id type="github">yesodweb/Shelly.hs</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/Show More
+++ b/Show More