gentoo auto-resync : 19:11:2023 - 23:08:59

author: V3n3RiX <venerix@koprulu.sector> 2023-11-19 23:08:59 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-11-19 23:08:59 +0000
commit: a29a0019eaf0bf87941bdc1d9cd53937685852ee (patch)
tree: 64c0a3ecbbede7a93bb6625c84b70668941be13a /dev-haskell
parent: 5a31d854eec302fd1efb1466af757e520ae4e1dc (diff)
191 files changed, 549 insertions, 434 deletions
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 676ba04155db..9f2f3d40b3c3 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/aeson/Manifest b/dev-haskell/aeson/Manifest
index d05826c7bab7..9fe3c7a8e2b4 100644
--- a/dev-haskell/aeson/Manifest
+++ b/dev-haskell/aeson/Manifest
@@ -2,6 +2,6 @@ DIST aeson-2.0.3.0-rev1.cabal 5867 BLAKE2B c64638d037ee4599a15c2c2c051b569649f57
 DIST aeson-2.0.3.0.tar.gz 297283 BLAKE2B e6784fd2081c56d6f2f2fb82b383478ab743fcce77568c430c2b62a79b4ee89901b7e278b1da948215215d50ef72bbdef128fb5dfb6679c92d30586d1406302e SHA512 546adaaf864ca40012a268d71f442479f0ad7c69e9f943391801570e227a2faa652494766f1f63b77c730e019e83ebdd7511426baa12792a28fbb470eca64552
 DIST aeson-2.1.2.1-rev3.cabal 6359 BLAKE2B d3e42c55def1ad014ad4d74b08385c462f6c9e5ddde40c0e248742e4123e58926a7e9fafeb3db3c1f98316bc3ce225430ec2571943c0ed50b206f6424fe5445a SHA512 2c7f2185c2c1e3506d6bc39ba096bcf9c6364b9437501c591b1accdbe081510a51bfe3a76e1fe63c40b093e263ac2eec8c4b58c31c93aed95918781e8a77b206
 DIST aeson-2.1.2.1.tar.gz 335908 BLAKE2B 73ca0e21006d68259c56313d99de897199526cd0d78f3d124d9f42e53bcd7498b3ac0abf5d1327ee64fcf29c7771186df88458a140eca21814ee4d77459b71ee SHA512 c7e3c5d61ac99b7e66a468cdcd0a20c9d0f42142b2398086aa1a3a992c60814c9d7505e4c15120fb00f0015ab1fb5592d6acdb31995e7af956f2867b95f12a40
-EBUILD aeson-2.0.3.0.ebuild 3198 BLAKE2B 4038ec4bf03d288cebfdaa6c61203f0afe6b51a5605113df8af1e97a323b84a99164d0021e76738a0610dcff79659faf48e71ee8f74c1b9714b73c80d2ec2970 SHA512 85697c1ac16081748c2491482c87296d7bc77991912f902137da2484ebce96707cf1ecdaf414858df529a9b44c3fa638e956ef70dbe10b5a86996414e0ba4855
-EBUILD aeson-2.1.2.1.ebuild 3428 BLAKE2B bb0ad030965c842afdb5dd1a75848f2088aa9a922d2450b1e0a80086d86a9402c0eac10e9c2f2c2b9a6e537c9a5a57bf68db653adf1b1f5bd53f9fd939aab316 SHA512 69334c84df7ea76bc48238120027b6f4eeff7f31cbf6a69debd8644897ca6964a7d7f028f3b40fa78487e19dc905c0368fdbdc67cfbaed936c4195fc949124c0
+EBUILD aeson-2.0.3.0.ebuild 3196 BLAKE2B ed12f3768907ce7c79972f83cd7ddb7a0a59df806078e86c26bb32840b3b1132b98588a87d6575e4c391983f0f4b73e09231af302535c035831d7f0ee0e3351f SHA512 9bbda1522f310325dfa9d02954f5779fb6aa6c572cb5af6124118b035245ffd0b2cfa5cdf4f57c837c870011901f25db8c448deb9afecf594267bda35c57681e
+EBUILD aeson-2.1.2.1.ebuild 3426 BLAKE2B a41ccb14d08caebfe0fa2e8b4eb58e7760e303e687eeeecda47bc576997cebf089934b5bbf4ae04ca14e09afd74aa0d6c4131883aa4bb60b014425e2e4695e81 SHA512 d60e998adc01db084bdfd798f2ea6c795be7cbc99acc9dc45c981a4b59e8b4e4e495a2afcc3e5b901ea4ebe99582e64f105daf77811cb390438766f8d703df04
 MISC metadata.xml 597 BLAKE2B 6aa59a23b8cbae8b7ddb6ed4f47a68ba83ef555afe14bcea29165ef7d75f55bb810f33106f4495645721c1c93c9a40ec8c607e5d227fc9d95f9e1fd5691364a7 SHA512 0e854ee5507a2f2b3ef7904fb05f5f3070affd6a245243adb1ba770fcc6c085950b155838a4dc0fc71947baedf45e1f8b03ebf9d568a231b79c00b1831610839
diff --git a/dev-haskell/aeson/aeson-2.0.3.0.ebuild b/dev-haskell/aeson/aeson-2.0.3.0.ebuild
index 2c9aed3a5f2a..2f374da46b2a 100644
--- 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?]
diff --git a/dev-haskell/aeson/aeson-2.1.2.1.ebuild b/dev-haskell/aeson/aeson-2.1.2.1.ebuild
index fc13f5d57318..7d33c94268c2 100644
--- 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?]
diff --git a/dev-haskell/basement/Manifest b/dev-haskell/basement/Manifest
index 9a5df61ad802..7adbcfd36a03 100644
--- a/dev-haskell/basement/Manifest
+++ b/dev-haskell/basement/Manifest
@@ -1,5 +1,5 @@
 DIST basement-0.0.12.tar.gz 134142 BLAKE2B cf0ff62bdd69cdcb075b5e63e9d60e7033ac85007101cd8c1d38776cbd1b60b336606e502a91ab8fb7275273f9fa3eae7344f0e47aa269bada2649c7be07caad SHA512 4515fbecfb8280cfd669313d236a5e3b4ef45ba3fd3da8626073fa3a44a889370c48c582ea633eac5df4a5e716c495cf827deb9239274fbdb63a14d19f9682fb
 DIST basement-0.0.16.tar.gz 134837 BLAKE2B f3be5d658e96f5eb6512e2089421185ac67d634a6a61cab13c183d138a34bb6d5a42146f57b08ba0b5c6b4cb0af0b6c9b0af42410602a24b8756917b49ea6cb6 SHA512 dde9a98047e8bece8d938161c95cc25a5924193a271e40120d3a96f02927b5050a8d3abed6c34ae1910bb17c07feb46664dca39d7ba594afc78c055ed27023d9
-EBUILD basement-0.0.12.ebuild 573 BLAKE2B 9fb43ae2db985e3abb54d57de573a64ef5a107c7e0f65698edcc725e2c7d236dbbafd27d095ceedbe9531b2dafc1268db15e1dabed9a6b30474a0da3fa07d260 SHA512 59d6fe18a7fee3adc34da58482a8216f63add2013ce5ad6b6cd6209f292814f3fa7409eb472324018866c0a5ed7357b82fd7a5811c213f715caac4cdc16c767e
+EBUILD basement-0.0.12.ebuild 593 BLAKE2B e264793a6b15d80bd97fff0f33932d9cd89f9db474cdca3589d7471bcd27053f922878096a403de912417b3c9c89c03ebf49f5f862bb9dfa38f2feda897ee161 SHA512 2af078a4cd6ff4d31b7602c9cfc1132c5c36dfe3df9702443a92ddfa7932404243b1e9598b1040269ce790e8f7e5842a585a6224f7475f3ce48adaa00de30a06
 EBUILD basement-0.0.16.ebuild 513 BLAKE2B ba71a4b838a37b19ca277c5a4d37fcba079350750a5764b45dd0f6f17ee401fa5d25dc1218b9394e0e5f16d8f7e21e4bfd64ddb8d8411c3d8bce35a2e4b9a7d1 SHA512 c64dc28ac1343e1bd5bcc97293ad0e3cca4aa92660d755e329ac3b0ac96a7d9ce2eba41a98d326b723cd96d82be2636e6fbac8590435499b7cbe7a5d36bb4b3b
 MISC metadata.xml 393 BLAKE2B 25e161d9fb23ce6aab1965f56b62352c9f77c70d41413da1dc68206ff04644ec0617ab1beef6bdb6ffa65622a4c05936a0ec5c540bbdd64a95002d9b23f39e88 SHA512 cb2907b4a0d421d9b295f34d6d9481d0c5f9446a1190e3cf084a99ef941a204bc73631783868a57cb2a176ee8cfde6098015f276a51f75e54cc316dd70060f21
diff --git a/dev-haskell/basement/basement-0.0.12.ebuild b/dev-haskell/basement/basement-0.0.12.ebuild
index c5b40f0d6918..6ba5c0feea65 100644
--- 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
diff --git a/dev-haskell/binary/Manifest b/dev-haskell/binary/Manifest
index 379d070071da..fc666bf7e19d 100644
--- a/dev-haskell/binary/Manifest
+++ b/dev-haskell/binary/Manifest
@@ -1,6 +1,6 @@
 DIST binary-0.8.8.0-rev1.cabal 6279 BLAKE2B 4c87f56dca43a860388120dec92f58bd8b6359f0cb952df353ea37b3e65cc791394bf18f2fc4d72a8444a7fc4bbd5ca6babc37dd4cd6768d8f2aa387ea62b7fa SHA512 67027e5dbebd4a3225493fe416b354aa1a4f5896a48f121807163ad6fb4c6e5571849be230dd4d3be36e10f8aa2dc30acfbe50076d86e8933d8d20d5c4a8b343
 DIST binary-0.8.8.0.tar.gz 57327 BLAKE2B c105f4bf92ec52df51d3c7bda1aae99b3d40727aa4d3c1397431b2b727a934e62ee1f9ab7ed45b3502b17bd7a9a61f95a2a66690e40ae25b177fc8c79c462ae5 SHA512 9e4b116a2661d7970dbcf5ec3432ce88514380cab145358c3368a2dca35a16ab9d1f0d09ce2eb853a456764215744195d593629fb08e29b627345e3ae913592f
 DIST binary-0.8.9.0.tar.gz 57311 BLAKE2B 17915bbe2001413d8c0a92873184775e288768a2c33e6f669684a9eecdd667bee7220d389b6c26df39fb6fcf88a3e0d8a0e9e5ea70413b676b7789abc721a27a SHA512 247dd9c9f919c6a83ca7334029009bb753ba235a0006913be5ff13cc15da0f681823187669b58d804dee25592a7d149a24c4c4ab60a9f633a5195c37378eae50
-EBUILD binary-0.8.8.0-r1.ebuild 1136 BLAKE2B 0983688536f84770a8fb2c69c157ffa5addeb80c20b9dd4843ed529a57226b49beedbfb4954bffbebcf07aa5bd9c7b204a849814c1f6b6cb207949cad64db6b0 SHA512 6bfd8493a4aafd56199299d20c50f8a40beb521d88da68ad82c64ba5e5a9ed4f592fdf5631b91ed8ed24ef0b8cafb316b61efd2fa41906d819710a1427585a18
+EBUILD binary-0.8.8.0-r1.ebuild 1154 BLAKE2B 88fb7b54a6fd5b0bb6a40abae4aae2589e96afac2d9946f8acbcfd745d7eecd11c22cfffe7f770787e1d71f834ce0cb114a6a788eaa0173d870fbb0b82b43f6b SHA512 50b0736f84e82945cf2c6506ba9472009842f3af7b28c6440f87ce872a86466d02708b702a73e19075438ef38ba41f7f1b1d6cd24e378eb331b97c0f09552a24
 EBUILD binary-0.8.9.0-r1.ebuild 1105 BLAKE2B 7ecf7ef7b0a52856289f8dd34ccc7d8695c0b599fb8a07c502d5847ba8b3374ac119b4fd9e08edf11d9677f7eea635ca21e1bd62374b222aeedc169d927fc2b6 SHA512 8dac46204c1299347eddb39171764011f7c0aab4cbfa81d546a8e7b0f777d3e931d342da805577cdb3e9b26dd54fa7816fe0778b9814ca51109d5fc76b358281
 MISC metadata.xml 330 BLAKE2B f74e5f0ad76a9a40b6990e219ea3e294f21bd17d9b0a93f136edc3eedaf041f3ecbe267a3342c6b7890992be31b8ea1f6d5e1531ce00eebfe8d27491baa6ac44 SHA512 e350ec6c193ed162a05fc3bd9a2054afd057601ca4744753cca1476e0457ad2bfceccb6cdcbbb5763a351080d18f7e9ebf5b5a556d093cd563b969d9fb2779be
diff --git a/dev-haskell/binary/binary-0.8.8.0-r1.ebuild b/dev-haskell/binary/binary-0.8.8.0-r1.ebuild
index e58612f680b7..a83a9c106765 100644
--- 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}
 "
diff --git a/dev-haskell/blaze-builder/Manifest b/dev-haskell/blaze-builder/Manifest
index 176c02107d0f..15ef114f3414 100644
--- a/dev-haskell/blaze-builder/Manifest
+++ b/dev-haskell/blaze-builder/Manifest
@@ -1,6 +1,6 @@
 DIST blaze-builder-0.4.2.1.tar.gz 60704 BLAKE2B 0799da061985559e3281d064dc2624a1ae2310befaadfc2cddca6999f3725bfc2a8a97d73810566c82b6037e1524ee19059c10ed6eb88707e95792ce2c1282ce SHA512 30f8d1d70a1aeb5b4c4e3170e40207c0f39933050e04bbdff49683a8b2e850921e80fa8e2d7f2b7a2a19fd6340bb65fad9c1d33999abf8a388d3f0ce921d0744
 DIST blaze-builder-0.4.2.2-rev1.cabal 3685 BLAKE2B 71003f887114361d365105f2120ee300826de1f523ef94f29bcd76432613b81e27f9f990fc2e6af4bd045b49fd8a041802e07388cddfd9721ca8739e0e4834da SHA512 62f24833b5dc73e2e0ad8972b265e905bdc2f40f3466c6657bceafcd8c73a5a039bfbf9e99ea2e5a4b94363cec17b59de2775e0d6d6eb1877ff29a9035afe50f
 DIST blaze-builder-0.4.2.2.tar.gz 60707 BLAKE2B b096325d84df3b60f618f53d8288dd1bdd8b9100a88ff4853bc327a0f21b5a9c4b6ea4769203cbbed2740378420b2604f74a4ca25355ba1298b9a9ea95cf36d3 SHA512 4a0aeaa909a487c652103c5d68180fb34bd2a8be9d625b96056b632081c3f58b8588811f3f47fcf8b58c680ae1c38e4ba8d7066617cb1b660f1994520427d654
-EBUILD blaze-builder-0.4.2.1.ebuild 812 BLAKE2B f32c536cfe488e9a1e6c2c13c17d03826171e567abfcef302c5ef95dfeba20c62fd66fdb0328b88ea11529565acf8d810e1d1cd8d6c12217d9cee212b15377ff SHA512 ed81222f15a169b1e2e626550b43eba830184341686353d02dca739a5da2611348d79d541181d81d603a35e53cbddb1ef3a5b1085ecd5dc967a339171e7a68af
+EBUILD blaze-builder-0.4.2.1.ebuild 832 BLAKE2B b34774a0451872098f6f5cbbfe2bbdefc9f5b2fe458795a8a7a85af0c6c4a2bbcf94f3422935b74b3b8a8fa6ff2eb380d4c70b48d54693465131c5a7a5d34dfe SHA512 7a7050c1a3e16ade1340d5d5684f5e6a7df0dfa3d1662d66bde029f93a70d9a430e2e98ddc3a48e64de9ae395674f610e3288568f0f1c2a97f7e33a282eeb970
 EBUILD blaze-builder-0.4.2.2.ebuild 713 BLAKE2B c1e6dd0c13a78e0a32787572e8e6fa942d659a93336cc234527205611995ffed6b02f4444caf65596c1e4c506d2be9a67199e1e350fb3ccbe3cb41d79a9d51c9 SHA512 8f4cea3c1f5321fd506dc4922351496316b30553bd6467f567fcd2917780e052d03b581ba58f804464744980a0e440da7f8ea199f7f947600247fe03c4534599
 MISC metadata.xml 396 BLAKE2B 85d3eb53b010e72c225588d2e6be288aaffe1593dbd0832f8ebedc34bc21a835701dcebbfe31e734aa86387a31fea3b1c4915de3b4365e999ad96ad346351b31 SHA512 9678b42c9a1e2c61f87d5feab9c35c9e6d8fc46b7c2d32a543a2ac8e6531903481bcf44810db628b35559aca5fc49ef19005b3608c629e12efd3469b8e431fb1
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.4.2.1.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.4.2.1.ebuild
index 4cfc9c886f79..1081883d2e10 100644
--- 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
diff --git a/dev-haskell/bloomfilter/Manifest b/dev-haskell/bloomfilter/Manifest
index 90fb5d5a25a6..2f32a707cdcd 100644
--- a/dev-haskell/bloomfilter/Manifest
+++ b/dev-haskell/bloomfilter/Manifest
@@ -2,5 +2,5 @@ AUX bloomfilter-2.0.1.0-ghc-9_2-fix.patch 11285 BLAKE2B a172a2875393922a7d3d05ff
 DIST bloomfilter-2.0.1.0-rev2.cabal 1806 BLAKE2B 4652a7515577ea06bab01e561d8ccc8127b15b84c0cfeb47ca0fbc1af04e0327022135242752f4a2a6e829dc7b8aa2b1eb3a34a60aeb7430306664d9f1578fbe SHA512 59baafec819dac814a3c6336569fa9f13507976e1899d346ce6ea42a667e3e13fdb12e1b23443d46ef949c6b46ef665f691ad13d1952b41c5fd565f3598a1be6
 DIST bloomfilter-2.0.1.0.tar.gz 22100 BLAKE2B c00a904a32c2e16810b19e27d7adef365ecf48b62bcd8da871aa3b33cb9b6e18cb11771da5a7df7209ce048e2fa1176b9c3f015030d0349a10a32375f462df02 SHA512 1031cc28c5e5c1b7687355b709d436ebab1956ffd7591a010fa3852a1bc7412925a365f99937feeacf4b1a5d3c7b34bc0370707ad6e4533280dcac4ea3fa7c21
 EBUILD bloomfilter-2.0.1.0-r1.ebuild 844 BLAKE2B 2ac7371c48abe429cb053ae7f30e129ffc1ed48fe73c50fc4d21272d0a966f2d3df48de0f877a18e027fd9dfbfee065a5e913f5866611d3024423deeb587a550 SHA512 83d8f38937392a84185a2bff73b9c13057bcc807ca11ee7a6b048ef0a78157d14f19da9d904381946fe3f707d51769e6da3e191e69028ed3989fdc7061d7eb60
-EBUILD bloomfilter-2.0.1.0.ebuild 717 BLAKE2B fb3e2a55bcb7f89d900e296fbe9d974451264d7d5840c8c2b0f0b6044d8ea1f9e0dd91eab32b45ced3f348148d205948d16141deee525d76e89c864d312dccaa SHA512 2ef4ad72061f8ecae22e8752315e0eb991b000505be84435f2ea0634df42c7ea6dd1a5a5f52bca3257dfb0c1ed87e42a176d6fb67244c97323d44684b0b0383b
+EBUILD bloomfilter-2.0.1.0.ebuild 735 BLAKE2B 612e0b29d78a6e0f06a3caf2dbfc19d695557d26f147fed80045ad457ce2b0de61ec70879084b3cc50b44092316dd2232f0090872f0a4824f911cb5a81b2741d SHA512 25be4b25e265c98cad42a36b0d6c5f07e6ba339dccfaeaeb28f1b19e43bfdb3c56c5f2ec27a11a4305a84364a618bcc5a416d324203c8f7d6e69d4598b8bf83d
 MISC metadata.xml 382 BLAKE2B 1c5e7b64d7873879620a3d83611be7c16f5815b1e7ed703949a5720eb3767c841d6b3900f2494c9d8a699a58257479cb2d1a11ade056da512199a37121fd0050 SHA512 5c9190627c4306a3a6ae1eb90d757f9f5a9cf0a378d23b9b4ceed6aa1e46dcdf996397a94534f94c358f02ab3577dc898f18a9a570fda416f51dde918a4391e8
diff --git a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
index 1120a7e9a587..bce47d8d507f 100644
--- 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
diff --git a/dev-haskell/bsb-http-chunked/Manifest b/dev-haskell/bsb-http-chunked/Manifest
index 27b4314a091b..b072b0666b54 100644
--- a/dev-haskell/bsb-http-chunked/Manifest
+++ b/dev-haskell/bsb-http-chunked/Manifest
@@ -1,6 +1,6 @@
 AUX bsb-http-chunked-0.0.0.4-disable-doctests-ghc-9_2.patch 826 BLAKE2B 3583bf0c9a0afb94bc5b53e55a0506193dd02c588989964716b2969b1983eb1a2f80e954647cbc54d851e21caeaa4b23ef06622329bef1fb6ebeea7f20553f79 SHA512 78f1931e387941796cc8906039c4030d3c611bd2905db33d05f9f0f57a0d684d0685cad72b29bb7b77177f04cd900aab1bfe74bfb199ee3098583af994c8034a
 DIST bsb-http-chunked-0.0.0.4-rev3.cabal 2678 BLAKE2B bb6500f2b185bfdad11da72202c944c815db63ef5efde76bbe8216237390fc2dfb9642944ed8fc6edd78479486bc463dd3ff247fc4687fd458de7f033161c6e0 SHA512 aaa23ff987a3f9a93eafbb7ee31343038c465f92dacc1835441be8f89e20b88f4677b16c10fb775f66f77204273b60fe97c9c11846ba1822d63c4ed2e8fcefb6
 DIST bsb-http-chunked-0.0.0.4.tar.gz 6630 BLAKE2B d16b539f34518aaec4875b7644ceebbf50b94ddcdd9a2bb612dabfcd5eafbaa9753d187a5b137f39126993e0b75c9ffcebafb3772d948b45512e33ff3fae1dd9 SHA512 74c04c2fd372067c42d3631cdfc2ad7093c0c3af1145833ab307c538dbb936d2042492d4e81c520c3adde8634df29ff8558822f06f226c52d16abb4a35ab1a13
-EBUILD bsb-http-chunked-0.0.0.4-r1.ebuild 831 BLAKE2B 28afaf6eb81e594f06cf9277c9a98232357a02869c1d28666095f61cb549ccad5995daa2a51d033806cfe873382e36cf18fd3ec94bed8e13190f2bdc156bcbc1 SHA512 106894dddd928ac00b6a0956d742ade805bbc8b1014d3b21b6a49200c0f3b22613dcbfd88ecfc5752e42801f6d6dd7cb4916888cb70caeb97ea9626d3d258b09
-EBUILD bsb-http-chunked-0.0.0.4.ebuild 853 BLAKE2B e71d64f1ab70fa233f56983c797be8b4c6de442566df90c38b92ff60dfa9c05c8f396d39f71e694d890959cf839060a23c78ba1e59a6c75199db7d26df102a66 SHA512 ee16710cd5da3eb00a4d1b654f8432e9ec745a6acd9101111c60f5e06df68d1e4b1beee3d0cdc31619b1d4bd1ad39bbaacd6ab1efffaaef123306060cb286af0
+EBUILD bsb-http-chunked-0.0.0.4-r1.ebuild 830 BLAKE2B 6b1145044c9001ed9eb045f63ea76124a2cb2dc1e3e1f4baa8b9612477c01dec863e3bca7dbb2eb433f754efc946a31a9c367a47c9ec701b6437206987ee347c SHA512 e91c3adef77073665691ead9bc5b6d2d9f7081d902f1d89207f526e432d0a2fcc359be10e09eb7532736c2d7b556e6526282ae51b8454fd5d8d4d720c7972642
+EBUILD bsb-http-chunked-0.0.0.4.ebuild 943 BLAKE2B a83205b3b5ee5f6f85ea4399d2eb68b6ffc26c200589d2c713a3391ede24a4409f1c955cd769b949927acb75c8fe029c7f2d10a2203be8ba4a7b90942bee04f3 SHA512 e650e90d329fe9bbdf4cbd0f0350420d68803d14eaa4459193b6265128505881d9522fd0d09182eb0f13535d293bfb5222452e11779f8a25def53e6ef7e5d4bb
 MISC metadata.xml 396 BLAKE2B e6441738391ad9a9cccc9d36c6da046c49c496d9acc6ab56ecb1cc9d5c981d17e7d9b6934684f4d1ac4c23a8a499f0c4e62c6cdc02e1bf72dce82352128d7c9d SHA512 30e41135f2aa22441b7335979a13e27b30f50386e89664d3980980e58626f690cd00ef061a293d599af99d09acccb8d49a4cab66cdb67b58b056a89d947865b0
diff --git 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
index b6272269df21..6513ce234259 100644
--- 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}"
diff --git 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
index 934de12c6e19..5dd3456be0d4 100644
--- 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
diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index 0ed50b55eb71..1d2407c5ab54 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -3,6 +3,6 @@ DIST cabal-install-3.4.1.0-rev2.cabal 16912 BLAKE2B 9844dca8c72e39cf6f81267f9eae
 DIST cabal-install-3.4.1.0.tar.gz 640932 BLAKE2B a5b662aeedcf2f76286be8b2487f429b79a8c6e65f494f0e3b69013a15cdc1ca5b9b114aec5ed22ee8398345944040cddf4a61d5bead05a8a4c7eb93cac1cfce SHA512 e8a47dc15d65d0da2886c1d936a10648f58b0f29e36c5cc49936e7f5e9d77780956b79432b75717186c2374bdb7251a47801e0478edc481c154d5e5d0d1a70db
 DIST cabal-install-3.6.2.0-rev2.cabal 13012 BLAKE2B 06f2bd2876d97560abf7693faf0aa0648a685bea5a443fd517d32236db8dc22c100f672ec79b6e131acd441a91f8e139c46d8a1890f2656d8f2b74be57545b71 SHA512 f6422bd69ff798ac42d1b10790347bffef6e3fc3bfc8fc4be96b6ea990f77199eb388306e45810990fd090d7d7040d72c94f3d65dc6f2f69994bf6a18b4ef134
 DIST cabal-install-3.6.2.0.tar.gz 633319 BLAKE2B e7169cc852413b3cd9d7f763402a5cc4746f9412f008b9b4a456de6002fbc79c8b77835723e3819a4049fc4d5175528040cef543f6a0dfa6f38331be16eddddb SHA512 a02d72fd7d0bf7778b1d4f2925e0b78f6c321cb29d59d559da758bfa6a0cd17fc776bd64911db8d28a208189b35db50aceae109782a1011e059446c4c2d77ad3
-EBUILD cabal-install-3.4.1.0-r3.ebuild 2483 BLAKE2B 7831b558a18ab3d6dd9c50354268b2214276da4628b94aabd206c7e8e098571e0aba98cb967c7f7b82f14d318a2417077addffeb07b2fb82d98656ea6e4c06dd SHA512 f7efdbc93c9214ec7c46bc25dda4ad788bfba5b17eeaff95337125da296de0f31aa4f82eaea28f927ef7bbd97660f9be657ebbf5e046cab49da23069dd5a4ee2
+EBUILD cabal-install-3.4.1.0-r3.ebuild 2483 BLAKE2B f9e2f62121f07386d693d20d1c9efc70448b20f22b69756b600ef1f3510c09362163aad755a639a42a75a5e8a1497e3322b66bd8e69a5e725c0222ca0f85034d SHA512 ee84886358b576b2f822622b2bf4d0d0515bdf7e79833ea21b0d4b79ccde01afe35fe30c8a32a4dde4f473e1bf249f0663e1ece464c8e124ce70a6d3bf1f5a37
 EBUILD cabal-install-3.6.2.0-r1.ebuild 2058 BLAKE2B 25331a91780e7824a9b8fedf289f59198a03b2d352ed38a69c58b08626b40535322eca663635e74cb9343ea57e9946969aa6634dc31c29c6266bc706f9f7fd22 SHA512 99b0331c0a6b746f6fca6635343dd16c6e7ca68300333218389df078a9de0c41bfe1f3bb7394d20ce4b59332571a948e4800700e59c426765b715daf7028360c
 MISC metadata.xml 653 BLAKE2B 19c1abce7015d5f5f378a333df2362cf985f5c8dfe20f10229fa8df0c96f99f1a4373bdce9400fa410e9524a38070b89a5023ad3aa826d08571e415e47850103 SHA512 922656018aec9236aca6badf75620c9e2cc484002442ae432c7a5ff28d04f05716dda282716fa3cc40d17898148782e8fdc5465967c06c5327029fc14e0569f5
diff --git 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
index 0c5326fc9d73..9e2bce608882 100644
--- 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'
 )
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 7262abd81ee0..ea153e76c57e 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,9 +1,6 @@
-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
-EBUILD cabal-3.2.1.0-r2.ebuild 2380 BLAKE2B 97d19f3baea3728b90b7edcd8c10692d701e7be358405623a39995854e2390a1372a131ad544561f6aacbcff4c845f896207667d0b8d6d9cc77d106b91bcb259 SHA512 8914a31c63e9c01f017a89b396f96f48ad1c4b7e9c0af66efd16a1679d6fda9592c50ba6d9499d89d13ce76b0c067ec8c925388817b4c6527b247d305bf59584
-EBUILD cabal-3.4.1.0-r1.ebuild 2462 BLAKE2B 522e8f029fca0d9d122b64a1d146aa71fe1eb95896798407ecde35256c40d16c82042ad9d36b9fb421c756ac9d4ed7bab0ffd058b38f0c6ec203f41f266e088d SHA512 bacba152a2a6a93c3a4a27b4f63df5833a6c46e3f33be6ddb128da62ef758c456bcab91f92d659e5b1dd3625fec4941f006fc323a7705fc71fd42bec4cd5b820
-EBUILD cabal-3.6.3.0.ebuild 792 BLAKE2B 5d874741a050d936cbff4a64064bf0b5fda52390cbdf24222d96c5c4756db67f27ac07682178730dff984294f36f768ba0c03f92ab31df9367de6f03518fc2e3 SHA512 9a57a451c85a215b05777a3e9d9d2e2b4247f13e0a4583b66ba8d7ed8a0f2b9ac69bfdd377a283d2f3bf76ad05eb05fdc94b9581c29642478d00e8fc13de5b40
+EBUILD cabal-3.4.1.0-r1.ebuild 2482 BLAKE2B b673a814aed8647f696c6e807f1637ff678eee19942603a6391854551df63e780eff4824001a93ff1823bd8c0993104332dbfad78fe2672d5a0c701583936c39 SHA512 229b35976c3624d2af0665ee8f264ccbca7d78b5022f225858b510a7ff69dbb9dbe9c76ed9eaf05aa871675673d46f2d6226ed60a09d5df16556e4c49bed5ddd
+EBUILD cabal-3.6.3.0.ebuild 812 BLAKE2B f8c9bab41c9406be770aa1d022c531faf5a89a46c900c66d6436d53e2712c44a16edd0c720ee9e0d333473e12d4d27fd482de6f375c0e341a852fb8602399b38 SHA512 4626863a953a6663250601f16d2b6a34b0ef4dd5d1b675d62e690edb84b0b6e8c78cd77dc6e7d10e30c6d2171e3e9ceb585650830b270f67fc9989d0c2d36734
 MISC metadata.xml 374 BLAKE2B 91a20e51209575537de737e8a73caf77ad851a085d56e90be385eeb12404e8fe3ed3f07bd6d4eb1f40db53ac46215a16aed0436ddfe1bfe3e8757996bccb9b11 SHA512 1d60c23734ee5c752f928b4edcd8333df968a8051efd84a20bcd803609de5372ab3337a955cf11f0231ff65ff953dc3d9fbcc7e7ad92a1e7391737257a8ad669
diff --git a/dev-haskell/cabal/cabal-3.2.1.0-r2.ebuild b/dev-haskell/cabal/cabal-3.2.1.0-r2.ebuild
deleted file mode 100644
index f7ec4a9eae1f..000000000000
--- a/dev-haskell/cabal/cabal-3.2.1.0-r2.ebuild
+++ /dev/null
@@ -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"
diff --git a/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild b/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild
index ce7ccae0f5c3..c6c1f1ec4d33 100644
--- 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}
 "
diff --git a/dev-haskell/cabal/cabal-3.6.3.0.ebuild b/dev-haskell/cabal/cabal-3.6.3.0.ebuild
index 65f9f2dbf9f7..ecf27935c764 100644
--- 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}
 "
diff --git a/dev-haskell/cereal/Manifest b/dev-haskell/cereal/Manifest
index 494b652539a1..bd00a47fe655 100644
--- a/dev-haskell/cereal/Manifest
+++ b/dev-haskell/cereal/Manifest
@@ -1,5 +1,5 @@
 DIST cereal-0.5.8.1.tar.gz 20114 BLAKE2B a71e11b9d138fcc1de7da0cfe573b3c31a263c75f62628bea70fb17af6c911fd9996c32a69fb0a9a4328241072c684dc110134a2b837643dcda2722f37869e9b SHA512 aced40e81301fbc73c6029be2c4045cf63f81d40361d5939713f3d60db196dc25a70e556e9e74e194e6a3b6cac86997d2bfc8b1f91c630676af7d066268a25b4
 DIST cereal-0.5.8.3.tar.gz 20166 BLAKE2B aafc599c0cdb872818680f4a759267fa0c9de43d10ad05f0c2c504a72eb7533af6cdfb26b1321b802192d5bf77525ff48072165e314ed902947ea5ba8cfbfe09 SHA512 2dd9e83e4659f76964c2c66eac76174d1c715cc969c2e8c818033e1d9ed5633997fcf2311c61dc4e6f10db03e65a8c80475b84cda39592849a9c1112b0c0596a
-EBUILD cereal-0.5.8.1.ebuild 833 BLAKE2B 33400011c23c8492caaf07252bf8a9306aa19a67497ad832d82641833592b7ce7565418b832bb3128a97244e08db3104534d3153a24e02901a4b822a3014418f SHA512 6f5f786b49351a48471d85ba9a6419c6927dc57fd3a3ef57ee540d0bb51b0da26bf223e802e64014494943cdb2b3353af4d7ac48c2c45bf45c402f1cbae65d00
+EBUILD cereal-0.5.8.1.ebuild 853 BLAKE2B c8b8ae71bbf3f89aa1705b37d13f6c126d81d95022615d71242af307bfa291a3c6fc47d6a871125c2ee160d33eb072ea0f27cf96fda76dbe4f8edda062c6adca SHA512 29096c228d619db84fb91f2d22135ed26f60f7e692b3b764253498c89b9507f11830222a9547afeb8c7f7d785a04841e2d2c4ea5062bbfea27ca95e7f7469d37
 EBUILD cereal-0.5.8.3.ebuild 595 BLAKE2B 0eee3690c23995dbc1a9b6c2a7836a6bc15dd1eaf7535b865a3ea4d41b6a4ce76a48f975b550a1efd4bd2de67afcaa6458134753c15fa29e9270278c30c0d034 SHA512 e224208b1db93fc3413982c544fa825dfecbc67f01fa24e90ce22be25ec115393146702e40a2bd42b42cff2a48c605f3f9f49c7d27525a49174822656e97e026
 MISC metadata.xml 378 BLAKE2B 0312365e2412e518847ab56c5e92c40209c1d184ce99231229ed500c6acd168635f2c101c748fff93f54a355ccafb6c1875647cb617049380ccbcbb83dd7581e SHA512 ad5ff4a880fe19254ebfe788298bd5dbba51601f0efde956a744f57cd93d636cdb29421323d88077b5654fcc594748d450796334dcfa29ad36b944d59c64dcf7
diff --git a/dev-haskell/cereal/cereal-0.5.8.1.ebuild b/dev-haskell/cereal/cereal-0.5.8.1.ebuild
index 485e294221fa..a933409a6fa0 100644
--- 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
diff --git a/dev-haskell/charset/Manifest b/dev-haskell/charset/Manifest
index bcaf2e36dfe0..fdd95bbe1c25 100644
--- a/dev-haskell/charset/Manifest
+++ b/dev-haskell/charset/Manifest
@@ -1,5 +1,5 @@
 DIST charset-0.3.10.tar.gz 13790 BLAKE2B 335084804461f551d27a5af30fa71665f052e309015029e442159a364d6f5b261ce4eb00ea478059f861f2359f7d947b8dbf83a11d46909dab16d4ff85963724 SHA512 ad32c5380379570ec4872cc44236ab0833723f3a784c3cece7b2c8efbdf3f6930d9219a8a1a9d2b01eca9698b39294a8bae6cb44ce1d25b144ac86136da58292
 DIST charset-0.3.7.1.tar.gz 12507 BLAKE2B 1ea4b189dda47e05066b800c26c62e26b92e1482e546acf8606dd98cc1b8156de350c57c3e3df2b956a96ada04a1e564d681bb9af09026d160cc4f3b919a1500 SHA512 594e71a5d6ced52e1491368611775bda106119b82025e84fc97078753358af7d9f6c22b99291dd51a990ff223c4582f913e01d829418f8918652c3c9fc495792
 EBUILD charset-0.3.10.ebuild 623 BLAKE2B 163c27cfa8b4e2feef956767216ce98971ed0fa2da5183b0c7a278e8cecd4ffa1deccfe17a3c8e37511b3b3273db04d6242eaeae77269cb60882bf5236cf1e63 SHA512 8bacfff2358117b4e3da67fcbeb38dae691f5505448da3002efef05489949e28e277e11ff895bdf09b48ecc82514c69052f1634b05dc549780d638a27d19f705
-EBUILD charset-0.3.7.1-r1.ebuild 863 BLAKE2B f89fb10efb689286e33789f63678109e190e35535549bb1c58dc97319e76a47aafdf9ec01ae9d5f0290de7be7975acfd4af603995897a4b45b35fb8386bb0c79 SHA512 52aa3248a6bbdb6061c5830ee082ddb1f260cbb558924c2c0c794011bdb342e42e7779ca43f0239cecdaa6c3d053069cb60b8533865b2465872b27b82cda2aa7
+EBUILD charset-0.3.7.1-r1.ebuild 883 BLAKE2B f17a4e305825ea2c4fa6430a47af71d8fb72b70e0baf802418c306ca487a37062b9077d5954a9d60ab4d72e93b213271f548488394ef990c7d9d56d8c5363266 SHA512 05d32f407a6ee8214736913327f5718fc5fe1231dbe9a10d4805756cdb5741a1c2f977c276c3a6055b982da573370a6d192c41c4e8ddec71dbbffd3588be86ec
 MISC metadata.xml 377 BLAKE2B ad6481cf0b412c050c34ef55fbb818d723710d2b8ef7da113880031f9244f93f8b20e5ef669ec66f5749167354253ea2a34348eacf131c8456d9e88292942b6b SHA512 7e8443e3bbd8d948b52088eaaf119c62a9a5c6fc8510bf1c4309c453aef490d2a2b81728656f66df2dda0d2a4b12d3070d1282d22b884bf3e4b4301bc0336a7f
diff --git a/dev-haskell/charset/charset-0.3.7.1-r1.ebuild b/dev-haskell/charset/charset-0.3.7.1-r1.ebuild
index 141da654672a..14c630323343 100644
--- 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
diff --git a/dev-haskell/chasingbottoms/Manifest b/dev-haskell/chasingbottoms/Manifest
index 6a48874bc474..0fdcc4212c46 100644
--- a/dev-haskell/chasingbottoms/Manifest
+++ b/dev-haskell/chasingbottoms/Manifest
@@ -1,3 +1,3 @@
 DIST chasingbottoms-1.3.1.12.tar.gz 31960 BLAKE2B 0183ef16bcb79f545c97d0a18972fb5fcf964a1255b83b8f202ae96a3211b2cc07ecbc9c808200bdb887b7db8571acb7619e6ad62f8b8c3be0ef8699b635b699 SHA512 601a577ff45cb5565397fcc428073b7ce2c9a9e033950adb5af67977c719f83ce4fe2be378280108406ad2b9d436bd3e8d15e4b82846ffd8b881151fbe5941ed
-EBUILD chasingbottoms-1.3.1.12.ebuild 886 BLAKE2B 4b82967df4ba79999af71e1bf04aa65486c22a0db947fde3dddb778ed210ee9799da7725ffaec26cbd3322809e6d9c35af7965ff4bc3941a23eda3dcdfc574c7 SHA512 21f0e71fa8b38daf4e6bc44f60d04cbc9f469cf1942918b086a23a4a6c178609a284a4e72d7e111c702215fe34cd21ab514208787775b29ee44a4db2fc4b9c70
+EBUILD chasingbottoms-1.3.1.12.ebuild 884 BLAKE2B a52e980c59cec6a8b81a37f1a8c183ab6492cf4c1be675041fd441a4f13a1d77df1e3f6011cfe470a9012a3aa5f0313b502488941953ff02df32c431bb340338 SHA512 ec75f7919b1dad7d4e5243069cd5ba93bbeb9cd980e71e8d5520122c7b35fba0171d5864c179c22c170c8547c560549d9a87270d4732dba03c37a21b37306247
 MISC metadata.xml 330 BLAKE2B e1d9b1d5bf980250a3e3268033ee88de38ed9d9232ad51121bce3a46a239ea36791fe4620faf9548740147f3dd4d3da0c41fb97614b1096028995626fa59ee48 SHA512 192df327b687a409c71cf6bbe2e3dd252a99948d74bbcfbc7339ddb7ca825fcf756f14748da11c06a33e9fe34b13548717bd9db835592e020dab3b46475dcd08
diff --git a/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.12.ebuild b/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.12.ebuild
index 22357040b664..c85440c46263 100644
--- 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:=
diff --git a/dev-haskell/conduit/Manifest b/dev-haskell/conduit/Manifest
index c89daf7b3b0f..6587aa64a5ca 100644
--- a/dev-haskell/conduit/Manifest
+++ b/dev-haskell/conduit/Manifest
@@ -1,5 +1,5 @@
 DIST conduit-1.3.4.2.tar.gz 88962 BLAKE2B 0c4ade4df87c8ace3206e7d4f6b52ae472828f0ad67d5cf970797054f4423c86256c50fdd20f4a7d215b0f1b5ac424ce9431927732c17b1c7c73fd98707e9cfd SHA512 8caf67020e33ddaadc5f05ad3f1aa38d436388f0cb3dac66cb9a645c1693bcd134f1cb8d311eca7b64f9c5ace9ca97681511e5dc28bb70b7b52c43c62d5f3e03
 DIST conduit-1.3.4.3.tar.gz 88820 BLAKE2B af5b1c68c19d1c4428c06e123dc3aec4107dd230e61dae9aa99d96ea448f158136cd4d844edec3e97de65e9093363356b08bb5d4950fdd13393df74e84676063 SHA512 14d4557c1018514da4ae7ae41ec8a381ae57aabd86d84e2c961dce0b784ca4fb8aec5a2757c6fe6d815ce552f25bcc462c208226ca33094e0210b06651846e59
-EBUILD conduit-1.3.4.2.ebuild 1090 BLAKE2B 1c3856a1b15b332766571c430e0b00434a5f908e05390165ce36dfa8778c504b4d552de7cda3adff21940220cbf6ea537bf6a8c561be4d326ac304f598e870e0 SHA512 e8c86bde7e60ca9424a4a6bd5a831f663775bc5f4b9001a5dccce5c18e9432837554dab01aa9b6d97fe7c1047e30cc4c64c53f0bb0426fdb18cde42806f72cc5
+EBUILD conduit-1.3.4.2.ebuild 1108 BLAKE2B 5649056d96ba9e476af5baa9783944684c831b352dfe348b74a1bbc7bd1292b6f6ad5a0e266699ac4bf188724ef0dce3507ecb13e57effff935c10b0fe6ad959 SHA512 5b8aa8dc13c09aac05ba2e88cfd1001ffb0bf044b009b53a2b740b452a01cc9696a272ea120ae55de5d4c7ba353f3cf2576fc6ac42ba2ae30df02a065772660f
 EBUILD conduit-1.3.4.3.ebuild 902 BLAKE2B e2a2eab80f8f82f8e4c9fb61fada5c6931854e64e3c7f9f467f61e5cfe8426c13390ba435f82da09fdbc4153c1914e662835e190a63a08d8c3194b3a445e4d9a SHA512 774c1869dfde4ca318973e0099f3831dab034517772116633a5152b779bc7e59cf645fd3bb43e3f76752f7be09684e7d22e14dd0ebff7bb5a726c7b4cdd3a1ec
 MISC metadata.xml 379 BLAKE2B b9b1d33bc396de42c1c3b3d45a1b6fbc4f25caab17357ae14d88bbb595232b94b08761013f850b496c948b3d59387c2fb3e11ac6a00af0b6c3bb6fbd11b1e1bf SHA512 56d9706cc6ee004c834010a8b3345347f8d0ee23da2200172581b4e584f3442617c601ebbf27283d97ec56f6092e20269d66c095c80197b58a24954c509beef7
diff --git a/dev-haskell/conduit/conduit-1.3.4.2.ebuild b/dev-haskell/conduit/conduit-1.3.4.2.ebuild
index 387f2ef97404..eada6d7aee07 100644
--- 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
diff --git a/dev-haskell/crypto-api-tests/Manifest b/dev-haskell/crypto-api-tests/Manifest
index 2a6aa17a3543..6b8673f0fa4e 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 882 BLAKE2B aef75976fa31c272470d5f451e46cf691198b9c1dc9f726e6ac92ffbc59b39996584fec557790c5673afbec49f78f8f236ca1e9027de6fd93738059ad8c0e343 SHA512 70f4f30c300f9590f03321026d61bf93592de52e87d1129a1c069ebead6154c14808149eef78ea08d45247668fdb28b2d46290521030629fb6525a998b7d1b65
+EBUILD crypto-api-tests-0.3-r1.ebuild 881 BLAKE2B adb1d6a57a978e707c39f247d3aafb035bdf0849fba05d70a9c68c7b746153555bf1d63fb08acff086ea7599cce9bd4a3e206b4dce5348539675ab96b1833af5 SHA512 bfd24a848293a9d095ef50f4bf534c218295ac3c722e9f37dd320adf2c4bdd68f56bd122b3bf8d2d1dc95770fe16fae3b0af42a7bf5e61bf9035d72f1e78d986
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
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 c49b86f06b9a..c37ef83492c8 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
@@ -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?]
diff --git a/dev-haskell/crypto-cipher-tests/Manifest b/dev-haskell/crypto-cipher-tests/Manifest
index 916a34dd58e3..3f664268223b 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 1076 BLAKE2B aa9ecef3a5228b629f7b39d11388f05bb479614e842c7796644f37094fb8eeb1a486f2791bae254d76a68665445f37b6817c25abf7402795200d01fcf7b5b5fd SHA512 4c82056ca65f580ccac594d7952b877bb776aeb0f73958096d6e6efc6e97cd8e04e39b1c351c60e8525cbd725fca33c0a9bd1afe6b569a0e79af4792ccd86430
+EBUILD crypto-cipher-tests-0.0.11-r1.ebuild 1075 BLAKE2B 969b14669db2168499a61f817eb1d84eeeb71c0941810f75da38fb50ecca9e93d2e0e5bdddd59ab2dee2d1e408cc051ef6aaf4c3b474e093e9a1158ea80f8817 SHA512 89c16d29da0c5fac27480891e8a06b4ce8e7d789dd35c0b26c5706863d4b8b74d097834e403e07c3e9c5834f58aaa018bdc05d45c0ed7054ddd4826d58bfa771
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
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 825e15298f7b..67d209fcec66 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
@@ -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?]
diff --git a/dev-haskell/cryptohash-md5/Manifest b/dev-haskell/cryptohash-md5/Manifest
index 7b865425cb1a..565c600b0c6b 100644
--- a/dev-haskell/cryptohash-md5/Manifest
+++ b/dev-haskell/cryptohash-md5/Manifest
@@ -1,6 +1,7 @@
+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
-EBUILD cryptohash-md5-0.11.100.1.ebuild 1067 BLAKE2B c3b8994dcfa84df20a5252ce24ca8864efd1ceebc0bb59fdfb01eca35dbfdb57ff91e5b05fb598f9a2b0ac8bbdcfc7a0e328949e3003343278bae760da1bc038 SHA512 b3a92acb8556522b14a56658b8a33007832d3a6876cc4fdd47920a866efd7d32eef0fc7700865ca10d31f3cf255839ad3589be14e6bd15041506858783314321
+EBUILD cryptohash-md5-0.11.100.1.ebuild 1085 BLAKE2B f597cf203326179b354d5e6ec38610afc845d8a61a1a0d255d696d3db85386deda912dc3a627ac6ab93e736ae88debafb4623cf0605340991591c83ffb9690ec SHA512 50013a910e537165d12741c1c61d35c662a2130b529203d97e16f2a39258708bfe4ed737360f02abb546110d00797988a598e14dd560598d7617ccdd5bd38328
 EBUILD cryptohash-md5-0.11.101.0.ebuild 788 BLAKE2B 8245e56f04f2d15c5406ffce886f1f46c88ee88759c95579897cd12da94928e4b142720610bb0d8357af69ddedd9df936db93f193dd2130e7836f1ca112a64d7 SHA512 002f3994522029948cb7db8f8474c4c96782ed6752743a3f1e12c7155fe0a5df9e9b5eba75546476112ea9c953a813eb7fdb46abd3086a8178674823e195a8aa
-MISC metadata.xml 396 BLAKE2B b307c7432835d9019149b654fbce888656ffe63fac27b145a5221a71f032cd22db0eee3e4fe2ba75e397ac88b8fc0900175465c7286469f12a08ecd09610bf0a SHA512 2b17d4927fe94784dcab22536d5f138c96c346fa49bca5306ae97b9c5387a12e642c567f3e7ddee8f5d1927ce1408e4d98076931bd5a2c7c029b5e428c7ab565
+MISC metadata.xml 388 BLAKE2B 97f5c0f51e5d8e19d6108dfec6177b8237d304578633371d6b85f92f02d406478b220d52cf8043c94a720723665faf5cf6eaae8e4e7d5740458bfa4324a9a923 SHA512 111b348ebd219b22fe24fbf1c94d9ae3340d315cdd9fa6856874ccfa56096fe664c03b8e3adea578062bd9a51e8bf5d6fa4dbc7b5e595bce894fb07337c1d49e
diff --git a/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild b/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild
index 50d57072a004..9a1918cd2dbc 100644
--- 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'
 )
diff --git a/dev-haskell/cryptohash-md5/metadata.xml b/dev-haskell/cryptohash-md5/metadata.xml
index a39901938d32..ce013d3a56a1 100644
--- 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>
diff --git a/dev-haskell/cryptohash-sha1/Manifest b/dev-haskell/cryptohash-sha1/Manifest
index 84f5d930d7ba..3a7f05015fff 100644
--- a/dev-haskell/cryptohash-sha1/Manifest
+++ b/dev-haskell/cryptohash-sha1/Manifest
@@ -1,6 +1,7 @@
+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
-EBUILD cryptohash-sha1-0.11.100.1.ebuild 1062 BLAKE2B 4c5a210414e8b2323a6d20f6768ce5a9db4363520f5ccaa4edc3f0b13a5572835b05707ad05065cb3502ecd0e2b9599e025bf16640cad0aa09ad9f24da5b2695 SHA512 25d2ab0c0bc848aafabb6763855cf3a2157706268bd6315e61de11bf0c42bb6cdc94d7b7c20362729630259a57edb5d58cd01e5ec44c02443d55743e82d5f0ae
+EBUILD cryptohash-sha1-0.11.100.1.ebuild 1080 BLAKE2B d27d14956783a526de7e1360cb07b3e7d2d3ae6191c67f4eb3aede54632f638cef0288453c108fc3270783e42e64a5eaacbe36c9a7e947bf670e0a4dbca27735 SHA512 cfc8bd8adc9976af887ff9561d5856f66701d84b1986ceb592c75632ad302b3bd0b06dafa74f63a590d4447ca9758493346c37495dc68f803220f30f0ddfd5f9
 EBUILD cryptohash-sha1-0.11.101.0.ebuild 867 BLAKE2B 4ef6a85b934325a0373c5ea0148ec5ab40029bc81b4b621ed7d7870f18db36733608ee574fc6237352390a15220e5c1371d19bed9791bcd879413266347ea24e SHA512 8a3b8e8b049a6df55cb413c0bb4b90d31851e9d30640201d24d0dd7a82803dd3aaaa7bb6c37de8b5ac19af452b0f7527e0d86627e2b320235bc22d476b9c42dd
-MISC metadata.xml 398 BLAKE2B f001bec1dd8ddee517112b657acedb12916d123873c24fa9af2abda9ab118eb774778e43a44127b26b55ff4368e985261849ed621bffcad11c34091c50fe19a0 SHA512 5e578b4e254defd575a1c005b395ce6f30f6fdaf494eb5f269a1eaa6a709c14f41c7cb43a28a0efca2d3583b835cf349c8feafd96a8a39426819875a2fbbdc89
+MISC metadata.xml 390 BLAKE2B 6a9b0781baeb7dfa66dd64e56ba5ae4bfa9dd4c12b038ced5885cdc2b3a0ac40f1a44ca190ec72928fa5bda9bc130d0678bdce78fbdbf6a007d3e747b7a0df7d SHA512 ecaf4577b0df868fe45318f61b721e4c7536614ede13ed6bd9e9c8cb3d387f42eb0ac96bece8d13c921a558167d8cd7dc4d75a701daf7b86a557dfb73876d0ad
diff --git a/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild b/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild
index 1e0a3aca5194..7781ccfebaec 100644
--- 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'
 )
diff --git a/dev-haskell/cryptohash-sha1/metadata.xml b/dev-haskell/cryptohash-sha1/metadata.xml
index 114f360e78d9..fede62a037d9 100644
--- 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>
diff --git a/dev-haskell/cryptohash-sha256/Manifest b/dev-haskell/cryptohash-sha256/Manifest
index 908a76bd78a0..87977e95bb5f 100644
--- a/dev-haskell/cryptohash-sha256/Manifest
+++ b/dev-haskell/cryptohash-sha256/Manifest
@@ -1,6 +1,6 @@
 DIST cryptohash-sha256-0.11.101.0.tar.gz 14996 BLAKE2B 9caccc3eea4ad25c6ebbdd507771d86264a853f282d03399917b42a5311dcad0501bd0b4ea6fa00d039f67bcea3f81c116b9ec016d65cb2ed6f086b0448894c0 SHA512 c755f1354fb5f1d6cfb54f73e39692392517954118d98b39ac4be7460e75a9ddc91ad641fed0f17e5fa33b62b7b0734af66526ea757e00716832572bb383c612
 DIST cryptohash-sha256-0.11.102.1-rev3.cabal 5457 BLAKE2B ed2c47aaed406a62bff372abf9f7768a7a40dc3a84d9ccd16c50dc5a0a05957f6885a87619d463ef546bd804b406f9a632963ec60818efc12582dac6edca46af SHA512 b1a3807ce57eb3f24b343a903b6849c08e4de90d33f77504723b8c5b18138ab527a953fee3ff06d6a55e4af1360494289149e199182422a9734b209bfe9f37c1
 DIST cryptohash-sha256-0.11.102.1.tar.gz 15707 BLAKE2B 16f7b8c39df3eac22af30ea14c98b0a6ef8056118dbc8236dd8951f7d35e32ba07fbf5f318a0896b0ef70ff1459f03937df4ef30b0247835e7550fedaf42386e SHA512 fb4432050ab1236fc913ba50949ee52a117b0d74509b58868e8ade69bfc6e89e1379dfea48afc76d8527d4fdbaee9dd1d2dcea4530ba95a42441491df005e78c
-EBUILD cryptohash-sha256-0.11.101.0.ebuild 1155 BLAKE2B 04017bef4415c37a92ad58f2e4bee623b95892b5532dc06f8769349243ded5d07f8f1b73ebfd328de8bf215243299621c29b245ac943199209845ebe2d84106c SHA512 41da12162b754349ad9bff404ac42f24147163967f65cea7b8c438b4fa44963e8dbd0751d66bf430de97dff05134856015ee62ae8a8633da26e5ef1075f25296
+EBUILD cryptohash-sha256-0.11.101.0.ebuild 1216 BLAKE2B 4d170cf4673ccbd55dea5895cfe27c14b3d010fb18b11d876dc3ba2ebc7fe233475d422b6edd635fcbfc47173b720e6f75bfc8c10039396120e768ae5de8ed6a SHA512 8cc776b565aa7be672959eacbf9c7ac304dd7326f0fbcc6c247fd2bcd5988f3e77d4e785532002579692b56a192ce07c069f01669569c1c51c603490c3a8f635
 EBUILD cryptohash-sha256-0.11.102.1.ebuild 1309 BLAKE2B 7e9aefd7a3eb6dde6581279ad2cbd565e397d93e3fe1e8b7c6622d48c2ecd57f8981f021655571dbb29a3e29b7e8bfed8d0b88ce11e6728d67aaa0d27449669b SHA512 bc44bbfc0a7866a5d958aeca55fd8b97f9e28a6a374f19a6c38fd69e3c0e1e314b67b6065b377c9a34f5f6a5ec67ee595659da23dfa4684452f67af4dcc170fa
 MISC metadata.xml 484 BLAKE2B b021645a12dfae9090425935abe51517cf27d77d78a0abfd9aec5f206b04e3f3add23ed2cb619391efdb6e6d4adfa528500296683205937c573491f9234ca25d SHA512 c0968614a1a25b90015e3321dee512196d717ed23f389df1cee5ecf1ac1fa684ae9c8e68c80794449b24f059ba4fb8f73e8550939f12a85a06a00df57cfd7e83
diff --git a/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild
index 3c2252862587..f931823ec69e 100644
--- 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() {
diff --git a/dev-haskell/cryptonite/Manifest b/dev-haskell/cryptonite/Manifest
index 4157e4b4997e..704929773e05 100644
--- a/dev-haskell/cryptonite/Manifest
+++ b/dev-haskell/cryptonite/Manifest
@@ -1,6 +1,6 @@
 DIST cryptonite-0.28.tar.gz 616309 BLAKE2B 3fa11777574fab06c264709d4de7b56fd4b276fbee93f4731683a9a18f83cf77d2042679f2eac3044d336c5be382e1e4eb0c90862c20b0f452eaafdee401e616 SHA512 c1e485522938f94f15910a5b5a4a3e4dfecbb62df463c80faaa51e9d883c2612611b8486bd0fd13660766cfb6d62d366fbbd03df2db874d525514aae247b6242
 DIST cryptonite-0.30.tar.gz 621062 BLAKE2B cf955f83b72a4fe4ce4aac4d1b3bb322922e9e3e76ab6c6119c359c304c060ccb706a7b7df4d06817be6914535ede6c46f45cc3b2ef76d3a7404881531cebe35 SHA512 519120263fb7c2b9f910e48cf43feaca07f7e705ea70c578da362dafa637b654cab90e3b9484497e33a6fdd5b8f867c0ede60d0dddba02602044b9b3de502d16
 DIST cryptonite-338.patch 1823 BLAKE2B 99a502e16ec061b37e1d3dc343760c86c1eb1cecf23a9061ef3198082d2777fa129196af3322153558e1da7e87b125bfa3a1e32501482767bbbe2e4ca874d65f SHA512 1f00a31791fef52e7bdb2b052912f8ede9022ee4013d1f74321ff10517c4c8df68be9b97d4bfd88140f5686b3b9d01e0937909dd5a2c462920e559accde8e72d
-EBUILD cryptonite-0.28.ebuild 1967 BLAKE2B 9ec7273d21ae9257ea9ba20d8cd0780d7915a16eb39ed5c843b6c183ae6b63871198b3c5537164b0f69ab919c24aa9745a10effcabf1bbe0200dcc4c683d7d26 SHA512 f28b06b3b37ee341b1fc071a16fbb090dc02ae2435270b512cf2115454aa25caff1bc945a4086703bb0ef02b5b8fa85111fe15ff4501c7ce021c4a42a80eb286
+EBUILD cryptonite-0.28.ebuild 1985 BLAKE2B bfd4bfe60441dfb4a4438e6488ff5154873921b1ae356abd44630761788911bf7662fc538a545955ddc4d1ecdda368a3dbe1c1c2dc42689343b28e619347e47d SHA512 c34830401d9b66bf8e3c88e59799700f6c7ab7b3170bf611319bcaa2ff8449fbac7a2631d8213a1a48e4fa77372455139480333738679f3a0fbad5ba337de83e
 EBUILD cryptonite-0.30.ebuild 1774 BLAKE2B 36a27638e0b2ec655da12979c8379fb7412bdb541d4473a482a0d1d32bdb0f6f68b007c6623cbaa0f195e66fe15248b89aac119bf3c2b6e71cc9d60ea29c2fb6 SHA512 3a00f8bbf9e8ae449aa70c22f18601edfa30dda29a148d0de7cf8d928eec14ba2193a56bf4c01e8dbc8346aeabbdfe4477e8c24429b1ed03f5557cdfd26e7694
 MISC metadata.xml 595 BLAKE2B d88bb3ab1b16d962d64ba115c7674471780f9b0da47f59662256d327cd3573f78a3495ca7d2489d943767a79bb4c117059dd2a0e2933a575b28eefcf063f4cf3 SHA512 c5070a49a6e709e4f6db3e1702fb0e68182188f4202f1f6015d07a15a25f45275b2d1237de74345986243267e1d8610df7c53ed3ef6ac406b7701776a23f08aa
diff --git a/dev-haskell/cryptonite/cryptonite-0.28.ebuild b/dev-haskell/cryptonite/cryptonite-0.28.ebuild
index af3cb754b8e9..618c5f1e6b33 100644
--- 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}
diff --git a/dev-haskell/digits/Manifest b/dev-haskell/digits/Manifest
index 01695dda80e8..091c2375299c 100644
--- a/dev-haskell/digits/Manifest
+++ b/dev-haskell/digits/Manifest
@@ -1,3 +1,3 @@
 DIST digits-0.3.1.tar.gz 2480 BLAKE2B 92fee6671d5dade7a37b7faa4ea363c42b3ad810ec6cd486000148b9f6972a1b33122d5cf0ac8507cf097b1b1394d12d20414abf52ca1ed418c1a77553bf29ca SHA512 73dea874513585b1ccd5af1aa31fca2dbbbc7916ce1dce5a89fa0c842e86c0ae5f742ac345b77aed843591eec2f1408619ea44c876030d4dd626730d5c999099
-EBUILD digits-0.3.1.ebuild 701 BLAKE2B e56639b1e216c5fd107ab562f8003e44fffd87430b6a35e3bfd43ce46337e0f52090d9ee02dee69d24352c20e8bba64a14d6cecba09216fef4989a9c7da56051 SHA512 d6623151c00ada7f6ee28d7bbb60da710ee355deb5e6a9709e47f67c3ae96a70894898243c8b033a35d5453bfa1dbec1b18ae899846beb724e5f03c8c8e8d24e
+EBUILD digits-0.3.1.ebuild 700 BLAKE2B a94acc04abb2f7378bf1c54b6636c6fb3e6aefe3064afd057c8d099a292092b4d9e7be0dd8f3763b5d711452bc68eabb194384019d11ffcdad5f9375e9d83319 SHA512 59f04fb1bacc7232ac858bbedf1e0563f65565767a1c6a181117ccdce904b025e71093a346494da4746679e4a47b0712c35c0785d94a679321029e346ddeb14c
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/digits/digits-0.3.1.ebuild b/dev-haskell/digits/digits-0.3.1.ebuild
index 837cfd6751a4..b8587eb01530 100644
--- 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}
diff --git a/dev-haskell/doctest-driver-gen/Manifest b/dev-haskell/doctest-driver-gen/Manifest
index 5b39836c20d5..9bc7e43e1f2b 100644
--- a/dev-haskell/doctest-driver-gen/Manifest
+++ b/dev-haskell/doctest-driver-gen/Manifest
@@ -1,4 +1,4 @@
 AUX doctest-driver-gen-0.3.0.7-add-executable-flag.patch 834 BLAKE2B 4e2aea0723d70776c7bafe709c2c8b7ebb6bb498c67dd0c4638514f711df9d299d9f41fc2338d75324486c96868aad39da10671d53f223bcfcd98829b0c45eb0 SHA512 e715b58bc4d13dc39463f95dfa22bca74062dd07bb47149832a9eb338e41292769977a222210b772ff6d6b369d84bac1d52eb3621d791a70cbb526e90a22a175
 DIST doctest-driver-gen-0.3.0.7.tar.gz 3299 BLAKE2B 74012e950328df902b6021496f554c418df797b2b08c01cc93f2b4bd182cb6f7dbc0afaf2c906fcbe2dbec5ee47210bc790e9be43a2835d3bc034d6f7f8209ce SHA512 892a713d7a3d22e1bc25b6722d74ae37be3db90c439f70a19baf2ef6f5dc6acd60359e101c222c1b736614a53fef0928399c6fa4e6e35deecf4994c6973954ca
-EBUILD doctest-driver-gen-0.3.0.7.ebuild 795 BLAKE2B 80bed89db999ef1eaf042624054d9926e9755729d0333715a827d461b72faf77297206130fb02bcd180e172b88f18beb260fb74770ce5c339cc62fa755ff1a0c SHA512 da52a5a0eb8631cc79e42ed097e674a10149e6312b1d5670e93a1b9a13e784782d984a614e9794ae28409db5b2a395f2406e3670741de78632641981b2659adb
+EBUILD doctest-driver-gen-0.3.0.7.ebuild 1222 BLAKE2B c4b59a4abcb46d078c1cd2ddfefaf1659119e4f2f7545cd8e2439d9d75c36a79fc5425b1435b20a56129f80d198c8f798e36563a62663dc90bd755441a4e071a SHA512 d77d50c39709b361c08384fa9a16b22885472c2919659aa7096a33994d56255f588a99b347f26213ade4ad4f006cf02857850f6060e7b33042a89655c461f284
 MISC metadata.xml 487 BLAKE2B 72133cd4ae20e7a52a45429fcd536f57441d75476a823905e371a28cb66140e089b2927f807542040a9594ea7e114e612d3b569c4b1dc6d1f63b6202cff48171 SHA512 14fbb44f9305576d14ba501492b08d73660d6f39fa10815ae83712bea6384784fd12a2263b485d38cd773d7e11f3f92e1ff08cf7c13e9f7832b3275d6ca3dd28
diff --git 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
index 4607b051369a..eca005fa90d4 100644
--- 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
+
+	# 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}"
+}
 
-	haskell-cabal_src_configure "${config_flags[@]}"
+src_install() {
+	local components=( "lib:${PN}" )
+	use executable && components+=( "exe:${PN}" )
+	haskell-cabal_src_install "${components[@]}"
 }
diff --git a/dev-haskell/email-validate/Manifest b/dev-haskell/email-validate/Manifest
index 16c8346e4330..b6e2863cff2e 100644
--- a/dev-haskell/email-validate/Manifest
+++ b/dev-haskell/email-validate/Manifest
@@ -1,6 +1,6 @@
 AUX email-validate-2.3.2.15-fix-doctest.patch 941 BLAKE2B 2ec4d7a23f9217ed536f7e709d63fd36b3e3abab8d4841fa4e54dcc69ff912a95094511bf9c4182c4cc2a22f5f83911449189ad5bb5eb3b30fa97563ca2c807c SHA512 c37cba04a1d12a1a3f071554d76bd6cee678a0dd5f7fd5ba7a01a17ff587ac0f29a6e51b5c4d3a39de47916f0bfb1dd222411d590eea06665fca13c9f6134a8c
 DIST email-validate-2.3.2.15.tar.gz 9568 BLAKE2B 1ff8c3e5ce71f3ff39dec02e0cbc211ffea3386646a77b2c176cc0af47a61d13996b2bb68d36e77ccf3114c53facc9b121202cc5d70916a4aa2992fa3956a60e SHA512 0b852771cdf0851bc7024fbb612488bd7721cbce25b551f52932b234e57bc70ded2e5904853f2ca0f68cfb9da02057d4a1903d081ce81a382cf90d0d3ba25001
 DIST email-validate-2.3.2.19.tar.gz 9446 BLAKE2B 596619fc70b8f48d01af57b02ae05f88ab0b47b706c93cc533ebe4f9541399122c48b8444f006d3c8630cfa6b22af838d347526cea2b039013315c4c46d1bc15 SHA512 0a4ad0579cbcf18920703bb12eb296280b6f8dffd57ceefc7fb211ca48e792d17ea8fa37dc4a256a26f01816eb812081b571325803ceb64a7b9d7ae748526b09
-EBUILD email-validate-2.3.2.15.ebuild 933 BLAKE2B af7d04971e958810844570bff328607ccb4a4e84e12ba6e640cd21012c8adc0d9116ad9aeb66d3ed5be46b820631835587afa0c281d0ec77a0f846c5c27010d2 SHA512 496866dd06b31eb846ea6f3f875e8bde4c101fa3f5f4c974731f2837cd28724350b5b5a8a46ebab88136e45d15771a0e8b99c8d47e90823a1d5ac85722a36fcd
+EBUILD email-validate-2.3.2.15.ebuild 1001 BLAKE2B 30becb5b2f43e02d34a4747019eab3368dbde6481ab3aa60cae0aee9f9eb9ca06f92843557944c3821ff6b480250b9de07c0d9eefb026d205318802fe9612679 SHA512 c43dbc41848fcbe7c4f78f56c057daabc3213eb6e5b960b8f1b8134d5fd3233781c732dfbd849688b1cb8afa79adab87ca5706b6f477dfe8f61b7f2302c80fb4
 EBUILD email-validate-2.3.2.19.ebuild 711 BLAKE2B 650c6860dc4dc26cecb737ba9c6867e8f4333ca693cd3b18d5144589e7644c2a1091f5b7a0b288b954700b4cc0665e433664262c432984148cd6e5de3ed760bb SHA512 a3832bbe6c50a54f5ee9816a0ec6902bd629970dd584f6c70c2f52e3a9a4741ef703ea2340550a3c93adb932a4505a4fdaf1c3b3f18f466fae9e1653830d2adc
 MISC metadata.xml 394 BLAKE2B 1471e4d0dd377c923ea777255abf149a3a62ce48b256ecee2ddea0ad0dbea5d009d641d1703fb96e11e7decd56bf50544e454921eab7ae079cd909b7a4035d32 SHA512 8f35d11dc9d6d97f281bd5d6d912ab83492b8091f1b6fb670b4bf13a2b1ba795752372c11d5907c2cdee3881760790adaf71fa2d15222a12e9e81a3180a2b310
diff --git a/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild b/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild
index d58ef3b9de9d..728adbf91c85 100644
--- 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'
 )
diff --git a/dev-haskell/entropy/Manifest b/dev-haskell/entropy/Manifest
index 6e7f3ef7f8a2..f19f30cb775e 100644
--- a/dev-haskell/entropy/Manifest
+++ b/dev-haskell/entropy/Manifest
@@ -2,5 +2,5 @@ DIST entropy-0.4.1.10-rev1.cabal 2952 BLAKE2B f47134454269b5fbb554feec81ff6eccd6
 DIST entropy-0.4.1.10.tar.gz 9060 BLAKE2B f1f9d80af0e8ad7d9bf34f8d13af6323ac530ec294d5d7ea5484cddf087b271638daf25f8b119ce426bfebae4f9d5d2a430b316fc4c01c5b282ff6a0a0bda9e6 SHA512 521dded7ae41cc532993236d0ced394f98f495c0c8950201064d17430ee6599d9cd6f3a4f17a19429396ee4a34a3fa17b39af49f4fee730efdae3d42d134c96e
 DIST entropy-0.4.1.6.tar.gz 9464 BLAKE2B 484e72ba8b6413b6205db4660f52d183dcd075bce836de6b339e2019d584a90b9f650d6b808b46855c9a423e41f21d814e10026efec050f507edc68106568893 SHA512 201a75efe210be5728a1c94ba9ec62514b96c388b6791d9301b34d2fce0208a9fa4ef25965c7840d052fd6221f15a1bec196a6eb209e6d03c3e1f971161df1b1
 EBUILD entropy-0.4.1.10.ebuild 663 BLAKE2B 40deafa750cbe61b38faf6c645408a9fc42dfc73cdc1d6639c480cac9670c36f22cf0928554f8dbb7e67d20e9cfb0101bdb75aa66e8bd954656e3ea4fa3ba5b8 SHA512 76c67222d5aa8b9ad7dce8445c79384c64032b1b22ebc70fe2a4a6f80e6496017e792459f8e372d95e9980460fbe0cbc9d9b8df1a3f19d6d47c04078495a2b1b
-EBUILD entropy-0.4.1.6-r1.ebuild 704 BLAKE2B 5dea2edeb70e45b804e610bede7b5c6b9ee06b019fc0d43ce82218de5dbca0a1e0b863b3d3591568e9eeada5e84f36dceb92678cb793ca04d25cbf7cd089ee00 SHA512 13cea37a8f2b905c99264d38f21d0a8c79abc7acb8874a640cea478d8f936be1281f931cddede5657ee4a0c82717ea1d156130591756c4da137f3555315fea48
+EBUILD entropy-0.4.1.6-r1.ebuild 722 BLAKE2B cdce7dba2e9a01f7b05ebbbe8974484d53b289bec22b1397d24b3c274c6f0f7c52010aedbfe9661564032032ae319ba2fcb2721e9da420370375f3ae025ebcfa SHA512 c4852a0941f966a13b343c7334c99dcd01223a24f65e5dc1197aa4454cde106521b9558ed50fed27b74ef03fea5480d5cf4b1510ea00dc5b9813f5a7041ed6dc
 MISC metadata.xml 646 BLAKE2B 0070a02b469fcbdb49eb755747f9e5bdfabc11403aea5eee9a48f5a7a38d36c700463bd0567af916dea28add6557fc1a2dcc2bc1e2b648ec00132bd8feaacf03 SHA512 6d02d62a1d1d61f94304d9845de9bd5522b6ee1946b6faf82207c67a39ce541f8b6a52d4ffa85e4cfadf71c2b6eed0c4b7f430f46371d0a7bfaf9815ce6087f0
diff --git a/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild b/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild
index 4a231a27f25b..997952325dbb 100644
--- 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
diff --git a/dev-haskell/extra/Manifest b/dev-haskell/extra/Manifest
index 19c2a0054cb6..9de463316f9a 100644
--- a/dev-haskell/extra/Manifest
+++ b/dev-haskell/extra/Manifest
@@ -1,5 +1,5 @@
 DIST extra-1.7.10.tar.gz 44872 BLAKE2B cdab5f08bf7f2de216aeacacf994b6008aee91900244101c0a0c1bc78f2fe5fc595d03dcab1a13196b885b639320e00fdb2117f93f85ca037b970a8d6a71f480 SHA512 02ce08f7f22defd1db81bfb407361e18b6d98295f561652880d3ee6e91477a7cd89126cb507e7362fe90ed7b46e57b55400ae0ad94f40de39749926efe3018cd
 DIST extra-1.7.14.tar.gz 45971 BLAKE2B 4ee978204771ad3198fa3b3abf8bc6b63d4be86d7a6b917e8a40a8524c6f947c6ae2298a469c2a4d844e4b0e43ce0cf8a02eb24458dff1b012006331b4d62da7 SHA512 9505a6b2b6aecdb0400a4bdf79e1888a2f5db30242903c50f0653df90960f53b8484ea782cde1e7aa5339bcc6e5b3417aa3494efeafebfa49fe318b57878b00b
-EBUILD extra-1.7.10.ebuild 674 BLAKE2B fb4aec8ed045db12f73f1b3d9e4efc2425efc8472b228c9da5f5b9424b9395ab25921d78225f86b8e1ea3e345bdae5ad91498390f23c0adb67f781ba555f174a SHA512 a5c752899c062d7689d78ad6949bdf28bbae5e558c1326a5ad5e2a5d44ab6a57deadccae49cfb8daa039f007c313ad51f341838c39a292eeaf31367c40ab69f4
-EBUILD extra-1.7.14.ebuild 616 BLAKE2B 53b5e2db12aa0b46348c8ab2ba62bca90d1d475773b80edd88fde5fc20b5af63b55235cb578792c045c827339b9bbe205b5025b1047fb6ad73d72e9a69147bc9 SHA512 8920ca56784a5f98e4aac2544e10c021fa504d1086dd642728f6ea717250bd1542defcda4857a411bcc6204e5703ebd36a74a63d55624166e26a6be1313cfd75
+EBUILD extra-1.7.10.ebuild 764 BLAKE2B fbb5249c0d6fdab4394b7742ea93f21eab813d6373c90aceb925c266c8108c20b7f69418a4d2cf3efde59f1c1e059ef1f98db651d80b45c61e76109ef94aa4a0 SHA512 2c27b4ac3f29971dcf4724073fe57da760bb942ee7f001728d3ef0eb84713dc8917619d2790ab859ae6bfd4f5a813829ca25a4f1e9fc3375adc6b20af3641b88
+EBUILD extra-1.7.14.ebuild 616 BLAKE2B adf8ec69d96b75f41cf9d98f8242fc8c6f9a9dc1f5a38ccdfc65aa3852c21a9bf9bb1d75e7cc8fa678be3141899e7276b57239e000c7d2526b2b201b54f88da0 SHA512 e524fb64a26563feebbf43495ef2099df63cbde544a8f4ddaa09258d586d23d01a8d7662945d7f0ab8c6ec9a0dbd7a3660cf81ebb9815ad04f7df1e3009327ee
 MISC metadata.xml 377 BLAKE2B ab731799c0008ce029f2a4611fe901b3b5cb8eda238b4905e5ed1b1f1ed0685a6cdd74d84c5810554e9dcd88cfacdbe2f1d64fd010097dd732911d89a1e2150a SHA512 3cf27b60f1f48d757018890af6562a5b73f5c9407a175aa55a7e5da8685e3397816b2f06458e0b20be73c04c8f1566bc0bb4f0b8c1a413a664a7c2b9ca80ee44
diff --git a/dev-haskell/extra/extra-1.7.10.ebuild b/dev-haskell/extra/extra-1.7.10.ebuild
index e2ee648bf59f..ca17f8702594 100644
--- 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
diff --git a/dev-haskell/extra/extra-1.7.14.ebuild b/dev-haskell/extra/extra-1.7.14.ebuild
index ca349cad6eeb..ad8d56eb55b3 100644
--- 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?]
diff --git a/dev-haskell/foldl/Manifest b/dev-haskell/foldl/Manifest
index 54d1603fc360..8f741c43ecd1 100644
--- a/dev-haskell/foldl/Manifest
+++ b/dev-haskell/foldl/Manifest
@@ -1,7 +1,8 @@
 AUX foldl-1.4.12-cabal-doctest.patch 2371 BLAKE2B e3a402b7bbd433e2744810f56aa9d467a72d90941ee8b7d760c4a56513f8aff75aadc34e6b9bf1fd7cd573078d774df92401c44d04cf82161f9c334bb3930ad6 SHA512 773aaf5ddd1743398fd26a33702455de1bd470130855e763c3352006e8f0ea67ad5599efda38878f2572023e9d3fb5209f5e6efb4e3ae68dd381602ee5995dec
+AUX foldl-1.4.15-cabal-doctest.patch 2873 BLAKE2B dab6f10dd8edff86eb349ecc9cfafea2aaa03c625cc799fc135c5efe12d1073176dc1ada7b2d1469bd9b6cc7a3666c6b58311ff0b6d5a2efc0e0385ae5f0b46e SHA512 1c7a5fa3a8993111e788e8c6a04a1d571b481c6db752932d6c2063dca0d1253547ef44691f42647a3748bed0405641fad025417f4d675217eadb5c6b1ad46e21
 DIST foldl-1.4.12-rev5.cabal 2682 BLAKE2B 616f3b1d69892cdf30039db5c82842d858b58d227f96e301b594e51b2052c7f423264b11a82c82669cc736b337dca901e242177064b0bf2b4cf128da619935b2 SHA512 394fe8ba15a59a270bc70deed3438a2d1e5193bfa3ec266dbdc3bac48e0b32279cbaab6dfb550cc551f48ce466a9bc553d1ea3748f90836f95f158818d267bd5
 DIST foldl-1.4.12.tar.gz 23210 BLAKE2B bbdd9a0b74d5b27b4b8800090a1b2dc717d023d860af8f26846a86866756211b30c755f6a1c3e604d6d1db91e5afa35ee943e014672c0a6e65712e0fbcfd29d0 SHA512 6b345b59c52039e914ea703ab88a08a8bba0a18bea91fcf4cf379ce678e5a97044f563c7b285cb656a764068756b4fae8321308e86813f86d04c462e9889e6e0
 DIST foldl-1.4.15.tar.gz 24449 BLAKE2B c8656bc7231e110dccf44e465acf33f9a61ad91020c8cb0b27debacde2ed4ba8c0de98d17c47db3218de4b56f3f026a8da74d092caca0b9fa66db4998a3017d4 SHA512 a0fb401313d8cb1911cc64e93cee7446a1785fac531f77b5f56a1165617c8adca8470be8a60555a07b48156924c657f4eee3094ad7a043fc383b459fa0006328
 EBUILD foldl-1.4.12-r1.ebuild 1263 BLAKE2B 9cbd3f9c0fbb64fe85aadceb480b9a152f6e846822ea057f5b822c18e3bfe313fc20f0dd63327d5c84b59f4fb0d599c191877eb7db086a7cbf5f20764197e79a SHA512 0bcf660241a8220de33ff59ced994c7e317942be69229b95ebd7aeb18c17c1680317b445c903c9f48328cf51af629ffc6a8003b28e4c11204f616f24732bee42
-EBUILD foldl-1.4.15.ebuild 1306 BLAKE2B b201d0971e596ac5d6b8d6e365c7d3a3d2beb79805eea8687bb66b3102b30e37f94cf8e56bb2bde0021292eb6a99f4f132e9bff579a88dd7232cdaa9e555a9f9 SHA512 39f8285e88f30609e443732fc8e1d58a8356ccd2ea19989346ee0ac15d95f417d57a835d178bed84a15043949bd59b5f29a5728cf0b8452101932bcc972146e1
+EBUILD foldl-1.4.15.ebuild 1416 BLAKE2B 98a52b37acf3b3e37fc7cc77de316d32850f23b7ed056b420ab1e1e19449aef2bb5f3234adbb5734784068804b124bbcfecb8d429e7d5d0ed0b855da51e8f126 SHA512 97c8b92184129c873f0d9032cbd3554945075898ce0cf85c040dc72490ee4b69412639e9f8d645ca4acd7e8c3fabc43c1f47b78ded6627915ed6a03adeccabfa
 MISC metadata.xml 395 BLAKE2B 35f4dce554ba0deeabbaee512a6af38f9df03eff02b79ced67e8e6ee420ad1db7270df1a78234d33b79071d4714c04133d2f5acbede7620f5b6428131764176a SHA512 d82ac0058506944eef9034dd8bcde16ebe521f44a82b4748ee46c7d2babd033dc5416b9d0535c35e6ba55ca166b84c05931b9d480b8ca681d784cff5ebe6c2a6
diff --git a/dev-haskell/foldl/files/foldl-1.4.15-cabal-doctest.patch b/dev-haskell/foldl/files/foldl-1.4.15-cabal-doctest.patch
new file mode 100644
index 000000000000..6c554607eff5
--- /dev/null
+++ 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
+
diff --git a/dev-haskell/foldl/foldl-1.4.15.ebuild b/dev-haskell/foldl/foldl-1.4.15.ebuild
index bc6602decc62..b18f0c7da8e3 100644
--- 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
+}
diff --git a/dev-haskell/foundation/Manifest b/dev-haskell/foundation/Manifest
index 51b0036a4b24..29212ef16146 100644
--- a/dev-haskell/foundation/Manifest
+++ b/dev-haskell/foundation/Manifest
@@ -1,5 +1,5 @@
 DIST foundation-0.0.26.1.tar.gz 120487 BLAKE2B 9ded2f69712de5f3af7fd6a2457defaaf7643c8eee51ad27c863ba0f00a39d05c768a3ae03cb9b8401c63e545161f194237e6bd346e6e6e8858ac7d8a33c6cc1 SHA512 56285e445dbf58204fffb3824a2f6144c3ef8eeb1630a5f5e9a658bc216a9bbb4db6f215e1e9b11bb516a389e23a9fc3275242d060b42db6b82b6a449224988a
 DIST foundation-0.0.30.tar.gz 120423 BLAKE2B bc9f63b3b25d01eee2b3ce3f648987d8f040385759638103574821ffc0d124455f574755105e54af2f338c036edd50c36101bec8f0cb9afaaf2086bdb3365cf9 SHA512 5b7a193a03f6f86f125a95363705c760f3ce8686720aa91e815daf131b42cb84a8fd39d448f4b2e803654e1e4764fdfea28918c4558c5f87451aa7c05714efda
 EBUILD foundation-0.0.26.1.ebuild 1033 BLAKE2B 455838ee461dbd54f76beb8eb54082c55d5ca97027de56b89cf6f2d2b5238f59508f498e7b971499d15244f773775c210afb5c2074992512685e4c59a1417668 SHA512 24dac6b3596da2eae5d0f046f4243bd55dc3adc77d866e220753551b1cd2a7b4604b99942741890689ae699553e5ace97b15cb002b31a4fd1a1f1f8e3a07641c
-EBUILD foundation-0.0.30.ebuild 868 BLAKE2B 3eef9b1ccdb2ba10949e6b5ff69b07a7449594fd97f906a1d31d283109c424e7b29a7e896d00958db1df3df86202c23bbfb1779831c9797780a74fba552c61cb SHA512 93f22638f3a208501b10e931974091b610817ef016452f5dceca3e2b66c7b6504bdf95df88eeaa612d68369653b3e986c3c5c94fcd66c2f66c087eb5fdcde899
+EBUILD foundation-0.0.30.ebuild 840 BLAKE2B 537b94bdaa8e333cca547f3b38299ddb69ed1f74c4914fc9202690253b87469f7030c9708314ce088791a72fa8af9b9e3e822b4607af889c01eb359a697c33e6 SHA512 6dd1810b693f868262e79df96acbe7da83fd21bb3d4f2f66a9489aa3b482282b53895aabbb44d4f0481cf487a60bcdcf6fac48150367b149526f6ca0568e3633
 MISC metadata.xml 548 BLAKE2B 8133842b7c728ae91781500b6dc1caaa35d3662e5b4ec6164fb0065f6c8b3018c4ba39ef7c099987b01bb70802df24678eb6b528e0c3ddecd49109d3bcb85c26 SHA512 641ca0f8daa9eabe739eb2c4d6bf9b9120c338956b811b37461aada17f6caef6f71d07c5cd32e6cc3dc03bbc55e97410d3d7934837c5329247ff3b0916b59a24
diff --git a/dev-haskell/foundation/foundation-0.0.30.ebuild b/dev-haskell/foundation/foundation-0.0.30.ebuild
index f7ec5444c124..34c119a9149c 100644
--- 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() {
diff --git a/dev-haskell/generics-sop/Manifest b/dev-haskell/generics-sop/Manifest
index 18c751b7b94a..69ba5349df03 100644
--- a/dev-haskell/generics-sop/Manifest
+++ b/dev-haskell/generics-sop/Manifest
@@ -1,5 +1,5 @@
 DIST generics-sop-0.5.1.1.tar.gz 29898 BLAKE2B c5d98a338d3cae2bd64abae2d2cace4c87a80d3f194b96ec8c31cbb5e660fd17c9a11fe6cd56eeea8af8d720c1fac9f7ce278338276458de019251157ea27418 SHA512 8514a4aef263c2c38928a716c1755db7f2f52243d742b944bb718bf3458ae0969b451836e889075a2c4ea5893720dbb146212d1960a9573851d3ad6c66fb0d8d
 DIST generics-sop-0.5.1.3.tar.gz 30062 BLAKE2B 6a487a9d514d879ea85a66e032b7446809df34af1a1699490445620c15b60b00abe8cf77f83a9e33acf3471652e2d7e37f5f4948a61e1ee6c9b06ba51596f2b0 SHA512 a4354012ade5d34d8640ce10847088f56f5722b5ee0122cfb3b5adac74675e7445ee3f47c1587174c661525d460e09b3251d70170892577446a404d6cdc68e47
-EBUILD generics-sop-0.5.1.1.ebuild 758 BLAKE2B e84c6a67d99ab8640328dba3dea1aedcb3fd2b1462762049feb43ad5a4d2340c4c38944bc548b46fc84f0e9ffc466a8b162b09bd2d4adb58e9aa2ae9b56b4be3 SHA512 b3eae2535ecef114c012abae7888b30f5c11cbe8af094c7112b94d3608f91eeab86bd1b71de8f722fb2541a16d75252cf37fb50a48176f578ce43f7e6b3d6dd2
+EBUILD generics-sop-0.5.1.1.ebuild 776 BLAKE2B a9b3d7404604fbad913b420e240ed81c009832eb639fdc4d7e4beebf26051e8f56f22fcad450f12d12a1b1712ca524883cb20488baebf570625b058b1e41f377 SHA512 deb00aa975562848265e9ab5cc27b36951b78d656ce9ccd28dea6a9f4978c84a1ab9c9c87d89c02007c53cc8a34487e3c5265d3353a50fbd071fd5143a84e070
 EBUILD generics-sop-0.5.1.3.ebuild 698 BLAKE2B b10213a3e4447f8800100e9541e2d1d400837fe1aafda7680b6859e9112a0953da8fdc252a7cfcb5d5c24facc12e84934654fb3cc94ea9ae4969db080717986d SHA512 d45a10603a640a59c7d02989bcc67ebab45c12993fccd233462044ebf28b17e54293c0d114a8737d74b18cbbc8c06d40af277ddf082d6024a0e353984f47e44e
 MISC metadata.xml 391 BLAKE2B 3be9b4b31a95a1cfb6da589275bef2371aadb7665a3d00b44df42a61c1105820f7a2eb82ff247fa5cb31946fd699aa65488a361d986132ec642051b9ec1d6f68 SHA512 976cfcb11a990d47aa83f6213786ddd828281d35621943c4d1ef418ba4561bb748ba0f7a268dbb883019555c43a9ba28c23f365fe18e5b93743c4bc98cb29892
diff --git a/dev-haskell/generics-sop/generics-sop-0.5.1.1.ebuild b/dev-haskell/generics-sop/generics-sop-0.5.1.1.ebuild
index 98903f45f0cb..5ff74fa11c63 100644
--- 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
diff --git a/dev-haskell/hdbc-postgresql/Manifest b/dev-haskell/hdbc-postgresql/Manifest
index f836a0f2f0f5..ec3178e52a58 100644
--- a/dev-haskell/hdbc-postgresql/Manifest
+++ b/dev-haskell/hdbc-postgresql/Manifest
@@ -1,5 +1,5 @@
 DIST HDBC-postgresql-2.5.0.0.tar.gz 24404 BLAKE2B 8fc7ca3b2fa6d379af4f9dd4b801921274a6c352b05e95b836f0208304e2e2a6cc18df765b432767cb6ef9fa3f99ee0488e095b82091c12838f6b3220f114453 SHA512 3a81708b119e156e08265b02f3b27ac764a854b8d79f7ed1bd1c191b897ead10d231854f0edaf1f27d76af18e4330c67b7ced0328830e013bab88ec47f668a4d
 DIST hdbc-postgresql-2.5.0.1.tar.gz 24975 BLAKE2B 2d71b0624bbd5a0ca18bda5060a0fb2aed5528120109631660832ecea11101af2e3a9f545d86659ca67bda44e9eb86f5662158668bb72ddc068770416146ca67 SHA512 0f693fc7bf4f78805f097523203024801b445348441b9cbb5f22a6e55fc0e3409fc4f1c08c7a20299bb96f407286d994c890f8d05a52cb883755be5246bcd4c0
-EBUILD hdbc-postgresql-2.5.0.0.ebuild 1092 BLAKE2B d774d50f2b416a7b5cb68dcbfb37c697747b7c0e9debf7f6947dd4e6ec09dab0be02bb234b37dc520b084c815d9c755b895a44abeba4a8412eddedd89a660d74 SHA512 e9c7feab16fbdd3b5f607e5720ce14545e93c364fb6e43342a2a14369941b97e8ae2a86d6d8530f5714142b5399a17effcbf95d29cb3577ba213e0fa24ab81b9
-EBUILD hdbc-postgresql-2.5.0.1.ebuild 1257 BLAKE2B fc7eb0e3fac8a809f728e07a204c6174a04fd33e09faee846420169ecc07d19298ceb4db6257403454db0b7da32e11518b61d2e67337c67e6195ed52e490edc4 SHA512 0e73c81da7c7ee804040fdc0159f3ee847115227b3efabfda16984eb23c1ffad8002660b87d84beaceb043a832c227b29c6283218aa02aef8db9fbdeb1c3fc68
+EBUILD hdbc-postgresql-2.5.0.0.ebuild 1162 BLAKE2B 3db8bc5d963c9910ba4ef22b267fa208b37bcc46e4190bed584c3b4a8f3522e2bd842deab36c9e62eb5ed2325b3d696dba0a2a12de072bda0e338c40b6a69ab2 SHA512 30bb2e500cff838aebf3db54b828d10212b41f037a520043a7c3e8f0a3c39710344efbf2811f9f004ab37da615a2e482002fbb14c7906983e8b6211b04a18db0
+EBUILD hdbc-postgresql-2.5.0.1.ebuild 1002 BLAKE2B b9dc5af0646d0057b11bfb52ad14f2a78540bd443d0676e5b6f675f340763a3bdb3c21bd3bff612fee52a6f819fb4f4a9469baed11bb3701402c02cab3bf435d SHA512 c68a153aa1e8da5f1ec0781f66a4f9cb3131f0a03e02bfc6890bec29dcd2b1ab9ef3d51753c0d295699b9880574bf491f4349219216ac305abe04b055bb79e28
 MISC metadata.xml 391 BLAKE2B b7e92043aa6f34cbff9fbc6a89b872175ff4461a6a3a0be202c9e5802e305131ead354144463ba5f65d6d3a396ae0c71e9663018f067a358195d2f47ea328ade SHA512 a263aa5510d856e807178a1d962af170f608015fec8a70724f65624d7d32e52df00c26bff98103de2e2b38d64dbe853f17368cdc912cfd7c812792166cfa1689
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
index d04a9048548b..1d9f67c6efaa 100644
--- 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
 }
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild
index b90c4758ef83..0072be8a8d5a 100644
--- 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?]
diff --git a/dev-haskell/hdbc-sqlite3/Manifest b/dev-haskell/hdbc-sqlite3/Manifest
index 7602a71d04d9..02e0d2c7a5b8 100644
--- a/dev-haskell/hdbc-sqlite3/Manifest
+++ b/dev-haskell/hdbc-sqlite3/Manifest
@@ -1,4 +1,4 @@
 DIST HDBC-sqlite3-2.3.3.1.tar.gz 15544 BLAKE2B ba1ae8142dd8122a158499623e6a64e64f4d54490565f70e58e083a4993280b73d901a97b1e29cc43d57efd184f931f4cf8a6f107d318bf756dcb9c830c0103e SHA512 17b2929aca806d0672ae83e1aa6122a38596504a4f23f868f1a3ff4e68f97c3aef6499f995659fa4ce82b1e8aab9a107172a7265309d4c3f4e9754e4cf756ec0
-EBUILD hdbc-sqlite3-2.3.3.1-r1.ebuild 898 BLAKE2B 30c92d9d2c174827314ebf7eb4cca911a08f8c34487946cb2c90812c388554e1fd37092426735b65bfcedc91354c2d0e9f8ed53ef24e21a507bbfe8135332692 SHA512 f78ab6a8149ad178415c3720445a3f3b7da40aa30559effe4a8cc04e110caba407c9914916e8928eb69af6d3a68a9043855265a1202e95ff052dad59a7aa273b
-EBUILD hdbc-sqlite3-2.3.3.1.ebuild 899 BLAKE2B 458cafb92ea977258b10368a1033576929d0d07c970bf99b676fbc10e7fb31d94e013b55a55e4dbde692b26aa2a49a923048ce1a82a4a8af9fef29c4e1818920 SHA512 ec14f30ba701400f6df5f2cc1060c84ac10946f33116b64cadedb4260c15c0be7dd2d90ce33505bb23fab4c7eaf47373fccd506c22d7e863c766b437d15be3e0
+EBUILD hdbc-sqlite3-2.3.3.1-r1.ebuild 897 BLAKE2B 55b13c4926677b97146857d04151c9285398748db5bd5c42603cca079413839103e975a8ec263ba93ba960f39b7bf966b3e342a760bf7bcaa9bffac435201231 SHA512 8e9ea9c3cef4bc60d82079364034184a58d69582b068745f7eeb43e4dd0de3d15b0d2634e4ef032d1ce48133292fb6b827746e46f7e3430db0627cbae0a90dae
+EBUILD hdbc-sqlite3-2.3.3.1.ebuild 898 BLAKE2B 84610a12b7705f9d2ccef810286b0e513c7125a2cc184ca1ceffe37dda860024fc418befbca0a0c3721f02d9be21d771b036d454e1c61dfbe65529809d3f7026 SHA512 79e7030dee47cf9463da3d396bf6dfe690bd371b7b953a476ff596c6d1ed3b4b0b506a3d1009fd5ffad07e34af865c99a1000c34592ea13678567888dab57295
 MISC metadata.xml 421 BLAKE2B 4d618601a33170a2b412ba745c800a020243c1fec5352f9a9e2ee16c1f33d8a3416f8545a33540edb0d41ee3f8bfae463d5a746fce60b79157c5ca2c8663a2bb SHA512 b39dcf5481d95bf13737969a49d72d004be0e3d83ef54cbacbebe81dd937107519326151fdbe7bf60801eb53c90fe15ff75ec7a65a5dbfb0d43fbc523c222922
diff --git a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild
index 40e59e8935ef..8d237bf11d1c 100644
--- 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:=
diff --git a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild
index 89738bb48fb2..f4c9fab13d7b 100644
--- 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:=
diff --git a/dev-haskell/hdbc/Manifest b/dev-haskell/hdbc/Manifest
index a438ba11dcc7..7454830f817b 100644
--- a/dev-haskell/hdbc/Manifest
+++ b/dev-haskell/hdbc/Manifest
@@ -1,6 +1,6 @@
 AUX hdbc-2.4.0.4-fix-tests.patch 4335 BLAKE2B 07eb99aef19b37baf6ef8dee74509b84e8a9ac237c02d1915c9bbeb638969a0a740381bf53375fc674d64e58b23fca92513ffce2caf86b4211c88fa56e3c7d04 SHA512 addd0874412c64af9feb8ff23a0f92b4052d2cfa76967d9b49ba5b8c2f069cf347b0af2173ddcc6933beb8c907783c0b6af80221187c10f6039ce45508b30a4c
 DIST HDBC-2.4.0.3.tar.gz 23489 BLAKE2B 23de627666bc4a03c5f3ec93607641c539c1652a4fa9b798dbfd1f9c09ebcffc562bda88e45a522e38753177d69ee0585c9536ab6b6c353747373b751ead7f2a SHA512 394a74e69ff854e657f66f1fe25ff4d2de33bf4410d560454ec7a2cd3e383586acc34eb694a7d1d70005871240417ee32d4163af9e33978921bfbcfcfe23fe43
 DIST hdbc-2.4.0.4.tar.gz 23756 BLAKE2B 5711f68c212194915895392139544c401981d46672f969fdc453deb01611826f536fefcc989edb1a723ccf9b385c6934d0f7102ded3d3fba17e494faad341a73 SHA512 16bdd35b8b2491ead171f4920133025ac6bc2cf47f8ea9c0ed684107ad576f757badeabc4e789f976948d96a47dafa638f907d9a534bce7bcd54b1d406fb001a
-EBUILD hdbc-2.4.0.3.ebuild 915 BLAKE2B a8692f56be783243224a25d4c51c21bb982a28bb78505fbf7e494e9b1c3cae9a2ee26dbb24fbbd46e3074ac5cff110f61e7d4cebfc21f1c09affac4dd01e4393 SHA512 0c6176e686f6c2db7990753ccf4de3f2a2ce32db581db8a4a71ba56483fea22659f1a35cb37c7f2bac9b888df81b6e27acff1f0c218b8b50d5542e0ffb82c45c
-EBUILD hdbc-2.4.0.4.ebuild 878 BLAKE2B c1a3104b9c2d4790e3220da2b87a72a70ea17649afadd1c321c77b2790b280321af9a93e84d1923d1617a3186a5b3b7806c4c1cd9d2696932ba67d573003f79f SHA512 cedb4a4b1e42736bfbfebe1b7018bde580a97c6e96258f41862a029028c4b738e7f19a8c923306b3d1ed5ef25538739df8c72e300e40a8c4afca32c027b3d762
+EBUILD hdbc-2.4.0.3.ebuild 1120 BLAKE2B d597093732b968e13142d9ba42f6d02deeabb6140f2c7b4a9ef1e9025f12da82f90de206c296c98831771f0a98c54332014dde21f86d5ca18bacf8a69531f52f SHA512 81af5ecf15b0df949613f151eb3f96dff42d44ff735dcbc534053df7175330e3c8e637b182aa43f11c358abefeeaa89b3b40b413cc8c9eb236668be151854579
+EBUILD hdbc-2.4.0.4.ebuild 878 BLAKE2B 26e9e07ad0cda9d87ee62866af3062e9adcc09add9257799bb53155a802fe8cfcc324190e4e0a298d512032e249ee38d0793cf40daa41031fc004096ebf1ae06 SHA512 097a2fc02a8c554e97579abb1db653dde6fcb97cc68d37e8afbc7c93914427558de47c28382498428740e5edc70841e28759907fa992db293aacb51676afc3c5
 MISC metadata.xml 369 BLAKE2B 9f28c0762fcdaf15160914ccec011b8117a751e44b9ea763612ed73ac8be23afb0300621956bf436bb5ca328c595ff639f59d7bcb2af25d3868eb3ac0a8f3d0b SHA512 be438ea1924c48ddec291faaae21ad3e8ef90da786acd62a5008288581d27181f42238fb3ea430034b9d6ef992139512e60c97767bbb639512213a0fd5a5992e
diff --git a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
index 16d3945d0c86..f2d24771a8d8 100644
--- 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[@]}
+}
diff --git a/dev-haskell/hdbc/hdbc-2.4.0.4.ebuild b/dev-haskell/hdbc/hdbc-2.4.0.4.ebuild
index 159e1a2ddf5a..3ef978f673de 100644
--- 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=(
diff --git a/dev-haskell/hedgehog/Manifest b/dev-haskell/hedgehog/Manifest
index 978e3c525f25..682a9301b978 100644
--- a/dev-haskell/hedgehog/Manifest
+++ b/dev-haskell/hedgehog/Manifest
@@ -1,6 +1,6 @@
-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
-EBUILD hedgehog-1.0.5.ebuild 2188 BLAKE2B 2fa187d09b19e917e3f3466618eb5cd78923fa0a9ec9f0a04cbaf2584a8d24e77e06b7458f3ee83c022741b57d521a17ac0e9d0f8efa871dd9797240860862be SHA512 d817494dc026d7a13ee7419b4b4e1dfa55dd48434bfd13587c001613b93efe0896dd3dc5917af20e8cacee164de7f5a5d9023fe09b81de47d8a82525417252a6
+EBUILD hedgehog-1.0.5.ebuild 1765 BLAKE2B eaa170bd404175a22af3a25c624f17a93a4e19011273090c1bcccf78a517faace4984e2af3560062719f3cf6958050df29e06ca15b7bf57f9644063d57a6222d SHA512 6d1ac3073f674df4fad32addf6fc584dd9c0baa9ad7bad01ef4bf4a33916345161b08ab491ba0abcb240632f22dc89719e77a5bfd0705f9585c826181694e913
 EBUILD hedgehog-1.4.ebuild 1807 BLAKE2B b8180a2126deca185570b97cc8935b6ca130abcef7c54a8c8680a302c60182dddf3a06480c7dfe06cd7f0e0b28a7c5ba12710c66c96bde1deba04e2424da219f SHA512 eec98cbdf01ceb2df12cb9678842a5dc6de2a7c166ec6f7fe44f32e80ef5d050f3839ce24dd68af593ccd3b660cbb19755451a3edeb53d822f1c8c9f8ce7a23e
 MISC metadata.xml 391 BLAKE2B 91d1f2fac4b3ed47e3dedda64415150800ed65fadffc096a89771ae7c243f36af04be66a256c856ebcd7ee57404d067fb9b738dde9dcbeb288f0c4bb334dbff5 SHA512 253ed41f45e6cc7b1ab4f8040251b583395951da05283188a5b6ab98809456f3417e1da3becf3bd7d1e0322dbe3d6337c1baa527f530ace402888383c04772af
diff --git a/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild b/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild
index 045dc2a47e82..5c505c139823 100644
--- 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
-}
diff --git a/dev-haskell/hjsmin/Manifest b/dev-haskell/hjsmin/Manifest
index f791ede4b0ea..e943b17e1a16 100644
--- a/dev-haskell/hjsmin/Manifest
+++ b/dev-haskell/hjsmin/Manifest
@@ -1,6 +1,6 @@
 AUX hjsmin-0.2.0.4-fix-tests.patch 893 BLAKE2B b00642b1f91916c4fd42e1b314285aa83646dfb4322f0c3af397ca1dc64ab796f28a5524f15bbec951cd849fc6fa40676650e595ae522dd017f9070e88b4a741 SHA512 60410616ab873ee3e3f16b31d8738a80a484b870f9f28da7535700c0de4e3171dc7a4eb865f1e0390c74966076ca845cddc5448ca6bcf81e917e4dd989631f79
 DIST hjsmin-0.2.0.4.tar.gz 5233 BLAKE2B 839cc956a7dad0b958a12f9e9ca45dfeb2c64ef35f6e746747a01d1bba771edc229b9822c9274a67c1fa483da64f94e500644b77b9d90283e1feb56975d0badb SHA512 11534fd3f351cb1b73e9f166ee42737eb31c10f8f49b2b8d593f9a5a07d08d6b070f71204ec41257d02f38b0dc1172f48bd95d59b553b9f602b90018a795b07c
 DIST hjsmin-0.2.1.tar.gz 5197 BLAKE2B 88bca64c36728370f11635499d0ff240db43a495e8c2871bb706096995a0ceeb4c0553dd9a95cffde4b97c22a9f63704fc65a12c52a30dde211b056abdb6ca29 SHA512 ccc7ac765c99986e15e35f7e7ceef96b4551dbcccef2a62ad8625a8e4ab51edd0afe87368d6066062dd3749e827dd84af1a1ba1d272934481a77763f1d4d793e
-EBUILD hjsmin-0.2.0.4.ebuild 867 BLAKE2B e40055194941e1d04ae0c68ba50ac4ec20ef47e62e65e7dc9736f446fb374294915ae717e93b9ac1c03e006bf21ec9e180a3eba3f941ab5c8cbbf729c2048e8f SHA512 db92d9a466ee899d7130b85f49e2721b358ae1a22657f6991c82944d84a3ef0ad8fcb8700c4ba42f944c27337c8a64156a5698338dcc5d8cff424421d76d226c
+EBUILD hjsmin-0.2.0.4.ebuild 943 BLAKE2B d4a1bc3d1450ae2cd078d486376f82d7445c5da41f85e0851f9f32961fd4f85463f33cea10a7e60e73b4cca084bd3b266fb0c7aca626e87c4a6096cdaeaa8120 SHA512 9442760a304be62e9db963874579e9044ae4b5e0936f0a37fad4678206689edc1f1919f19e8366c341a9060b8ca439dc4f7e290d688a77497c2bee874dd26af6
 EBUILD hjsmin-0.2.1.ebuild 1052 BLAKE2B 36036b8c89940bb64d5dfebd7005394167e177a73875a564b6d124c4dcec2ff3b1aa4d51b4b2b6e3bd5758b74a480f28b10f6665fda7e3c12bc7d529ce027e13 SHA512 368271b61f5426097f68afed948598419f51de08bb44dd7b4f12e48ba4a1f38d368b13c89d5337164da82ba66544eb224c6351e953cb529045dd320102245f30
 MISC metadata.xml 374 BLAKE2B 605e002b6265f431d2d2e9264295a1eb3c78d0d509f45ddde81c6a02a0272021b86a1136041b03759c918b6e76a5bdd21ce66a06ba736d51c57220fd9bbef0fb SHA512 8695617268d9b7f7440c34da6861492a5edd81c4ba6798a1ad1b0c704a7afa115e31f14330112bb6919d184333dba4ce0a49f1c8c90325efbae1822c9991c36d
diff --git a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
index 82aa7e1774c9..85827564b153 100644
--- 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?]
diff --git a/dev-haskell/hourglass/Manifest b/dev-haskell/hourglass/Manifest
index 97fd70c808b3..ed82688d9231 100644
--- a/dev-haskell/hourglass/Manifest
+++ b/dev-haskell/hourglass/Manifest
@@ -1,5 +1,5 @@
 AUX hourglass-0.2.12-time-1_10-fix.patch 1142 BLAKE2B 4481a378309e8effb1be519366510ffb7856b36ea1b123541819344da9da4f51102599779c58449acc11420b07e63c56925c3631fab14a6fd3a5ff9f36878439 SHA512 f44b597bec1a22a527317139282d86a5ceafaa62c77ab0d40638a6ad8d4a95bd650e983a7710490cd03bf17c3804d0e20be5cf2bab499e1173887fea4f454e78
 DIST hourglass-0.2.12.tar.gz 25797 BLAKE2B c833a2cfd1686f43a9ed101570a962255d813e6f169ce23d8dabd59f405c4ea091d8d9d08b118fe191cece215457bc034c419ebb6bc1d45fc684e43ea113d921 SHA512 c748d7f875ca0b1ea9034dba1a5cfa3fc4e51613ce24c90b54856fdc385d9ccc5eda3559f1674abf3ea966cc7851891dfee86bad897062a97a79db8408574bdc
 EBUILD hourglass-0.2.12-r1.ebuild 685 BLAKE2B e79a573992e8b764683359dbac673efdc3f0f2eafafe3e16553defe5ef8e14f46d6cc01f8af35ab8e6626f49c1a33315c7cf8ca44d8d53dbf4983007bd29f57b SHA512 2468430ad4c3f096d0421996262b1d2ae5f262bd2b53a33b9d418c77ff5e3f6dcbb1cc2910d9204fdf8787d5da34b67695397d837c07c5e09ffe7b09233648ef
-EBUILD hourglass-0.2.12.ebuild 702 BLAKE2B 385d80309be45ef17e7df6a4c9273e77ad5e740a8c91c63e9f07c55f43bd80f0a5ddd104297c06f0ed1118496d436d9a9624aa03032e9d5710a0545557a9a983 SHA512 6bfe12f71382b0aee6d681d8db1cd4bfc35aeee8ec3f2bab505ecc103b999df42c1bd3760797c9c55991a8199821414c9f79e5cbe5c6bbe006068cfc32add183
+EBUILD hourglass-0.2.12.ebuild 722 BLAKE2B c009aed69991fe1c2827708bdfa594b714e300a8ed22c6fb7dec53a821c868df88a47acd884a446cc2faa9bed1a9604ac2aaee06905337fa7090fe5e35c54eea SHA512 202cd97c79b39e2312b77b123439425545b2b6e5b8213920cc23e10519ccd0076c2db378187c0ed5de915420c26c5c763c7067942bdb8aeca3a1beae148f3775
 MISC metadata.xml 387 BLAKE2B eb6a49abcc9255fc37c19aadd93018625a5222e07231a276b3f81dea24250390860d0a84c79513c29e687a72fe0c2d8621c1946f66453c96ff8755293eb26ef3 SHA512 744f3fb40871bc376f7682d34decc5f004c9b43f42da2e27eaf6c76de0dd30266ebb96984df4338ba62ca5db67e2d4379ffad8de6a40cf98b6630ffd593fc9de
diff --git a/dev-haskell/hourglass/hourglass-0.2.12.ebuild b/dev-haskell/hourglass/hourglass-0.2.12.ebuild
index 52cc3dc9e0ac..0e63606ac731 100644
--- 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
diff --git a/dev-haskell/hspec-core/Manifest b/dev-haskell/hspec-core/Manifest
index dc24d2bc1867..c94afc7a0cb7 100644
--- a/dev-haskell/hspec-core/Manifest
+++ b/dev-haskell/hspec-core/Manifest
@@ -1,5 +1,5 @@
 DIST hspec-core-2.10.6.tar.gz 90413 BLAKE2B 9f219404602a93db9f6cc143ed7176eb6237402463772374951578c80261e982faae69c1430496c4ab58fb4cc2de4e74336902057d6fc5312eef07cbaff623dc SHA512 ae1dfc4819706511483646c61663ccabc39f0e17128d496bbc65a26c558f5d446ea2e0edcbd9cbd6b61710e522b581e5a412f7ef4fdb17daeebe187d24616126
 DIST hspec-core-2.9.4.tar.gz 79521 BLAKE2B c403787898de2296506cd2906641c2d91f3a4cee4cdab69e7e63e2ebab26a5729b37e938001992cccc76930ad5d4e39c0f204064ea542a2ca979b58acce77fdd SHA512 55859f3a6db6ca855a560b7b16f001784a81f6a70061374d58841fe0d6bdb99e98b522df03677ea132222ad6c96b3fed8d87aedb96dfde5326b7e6fde238e387
-EBUILD hspec-core-2.10.6.ebuild 1423 BLAKE2B ed162a59ab895bbc2755f2f293a630f72dbc0bece731faa4f245d87b205ce93bc98c49b3b7b63a24418fe09a58c5c0f3815337bd1d2966b8b9608b617dd90de7 SHA512 92fa6a3e2b498973f8e08c83992cb86120e9931458312fd43efe94a5f30cf045950a7721a3e7ce33076386ad4bc79f4d49434e4c4373d2db4a1e118a252ed78e
-EBUILD hspec-core-2.9.4.ebuild 1294 BLAKE2B d7739cebb08bd397c1c152d7885e6dff1469db6acc87a15a52665546d24832c2ba35e596ee2526229e5a1b34025b6e0659536a90a75e62638c9090d116269f78 SHA512 73ca6b91b09a84eff0231549a1ade54e59b3d82c7f9426651591898103c661b17e291bf9f9264f19f26e30f2ce93b535d03b374bb70deff603e6573282d9a1fd
+EBUILD hspec-core-2.10.6.ebuild 1422 BLAKE2B 9dcd885c329f541f3e1e5de441875317e2be76d119b9d19658c56519f2ddbcdb89f2e798201bebcc3342e244a1cc67bad7426d455bd239c8d473564558ac9172 SHA512 9c186f24aab408215218f776764472525f35d1f926a4c96f5cb4bdd729cc5ffd13603b02c339e6e90812813da7fc88de50f0a4a6e070bedc5683472766998025
+EBUILD hspec-core-2.9.4.ebuild 1293 BLAKE2B 10f265086beb7456a3319b07bf3832f65d6101dab8fb90d0bc8e9d940eccf8e2d8c77c48a01d5ace5555edbb3e1102f1ebebfb999948a0e4f925de573034099e SHA512 35b60b9b03614ee985f11652e90efa5eda7e2a1b1e103c9011bbb6cb4892fd0c5f7bf0b81ce39b269fb6908382c299c553c71f4bfeb044fe813ae362036424d4
 MISC metadata.xml 377 BLAKE2B 63dbd17a458efd86374b82cedaedbe352523f476c3b79db9171d62a8d7ef073dbfe7919833fe521cc4983605f2cc71c500d5e277e203bfb572744a4b7afbfba6 SHA512 eac890144053247ca5aba4e6a3f1eb9eb8013ce41e65dd46cd192280ea7b956255289389f84a76cc72e4836ccfdf4d0ac9bb5a05727e134d3e0a13c0aaa807bf
diff --git a/dev-haskell/hspec-core/hspec-core-2.10.6.ebuild b/dev-haskell/hspec-core/hspec-core-2.10.6.ebuild
index 0bb32db0635a..1b54214140c1 100644
--- 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?]
diff --git a/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild b/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild
index 7bfb07c32033..47e557342c1c 100644
--- 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?]
diff --git a/dev-haskell/hspec-meta/Manifest b/dev-haskell/hspec-meta/Manifest
index e54c7a09079f..33d26cf12761 100644
--- a/dev-haskell/hspec-meta/Manifest
+++ b/dev-haskell/hspec-meta/Manifest
@@ -1,5 +1,5 @@
 DIST hspec-meta-2.10.5.tar.gz 74024 BLAKE2B 971e2bda452e0d155754cd6ea02e06d8ab2ed492eea428b8f5c21b354e14b573eabb90182926e2004e88ea3c5e3ed30613fffa10c923dd9d91b53a991b85287d SHA512 2c9b9a0a91f8596de423d8409a734642520a317659d93888685a6049971b9fb29806904da48ec6d73f269baa8c39d34da1881d107795212a3c0564eb702797b5
 DIST hspec-meta-2.9.3.tar.gz 69002 BLAKE2B 2ed9b44eeb9b5b3335a4e7a695a199cda1bd405c9e041e251ac1f33cf9ade99be84853cbd32bb6204ec879ad342b55841425b0f76399c0a5d588f8769a7a6dea SHA512 d6205a4aead9c8824a89b18f41d2513a0115c76f9130b7100e349f2b8c91dfef34c704ba169f5b103895d0144a8fdf79eaf46abf1c7447da7d634eb3b7c8e80b
-EBUILD hspec-meta-2.10.5.ebuild 780 BLAKE2B 96ff692ec708c86a743efcc87642d6f59a249e4708e737ae9293ba68a6c05c759036376ae74928cae12e9f0f877a556497cd186b99b4db7bc7dcb3abc27f8701 SHA512 00ce954e4823ce38bbaa6c5faa74a7e7d92e856c4b9ca910a967276ebff673fad91334a02558b2238e29c7588bccd60f1c89feab8afa5dc1d33f058603cc13e4
-EBUILD hspec-meta-2.9.3.ebuild 843 BLAKE2B cb4874c4a5a1597dd1255bf5d9f8fd9d5390c68de8840948058710a2c36a9415965c50d88d226f0b06bbdde1449980205eb66bdb067dab1d20225e4fc30b4dda SHA512 67b54c2ee4ea0dffe508f30ae35e0c93f34800362060738971d4d435d1ae3dc86cc5287f96e1eff2f5ece70122aa9695e1c634a22340d18abe0f85202c204035
+EBUILD hspec-meta-2.10.5.ebuild 779 BLAKE2B fb89a78490aa2691bee89457fb4d5a9a1adf31281495ceb69fda8d2c9f255cd5ff1bd082a733ee0df64c59973b960dd5eca4c08703e3cb87c6d24705b1dd9edc SHA512 2ead02e86e252433ca199b4652a5f1cec57937f70a76131b0a8765c8f49ef6305f474beb3d4374c720a1fd9b6da6b52a68098349ce53beaff8547d0cb8bd1093
+EBUILD hspec-meta-2.9.3.ebuild 842 BLAKE2B 201ef93f676e98a2cc77a9b9d59348e5858ee7942a43f9b211cba17cac61d1825a5bd2325e9f185bf63ab83bedec8f21e92d336386cd87343f417d677e987327 SHA512 ee074f707f41fa41b284260659f1c17abbe6798074a0a6270dbcbb5b5a4a0edd5227ac0f4649f076c6def41624d14ed1f34d38e1cbd366cd44cfbc8e899893bf
 MISC metadata.xml 377 BLAKE2B 826604896a84b8327c8e16168cefe314524a75a5f97d1c83d7712b281395e10b38077a447001371ac572a0db9f3e766d6ec22b77ddccba991e957106689d4792 SHA512 d25b604842e02adf68b985a4e8a985f7c6d3e339592bfb870334a62f01867507fdc5f5baa17d163b7e7b7258fecf1135c29e5b69f91ac7baaef50adaebe47318
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.10.5.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.10.5.ebuild
index 8ae96f2c3760..0162ff534d11 100644
--- 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?]
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild
index 3017ed6db01a..ae4955444518 100644
--- 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?]
diff --git a/dev-haskell/hspec-wai/Manifest b/dev-haskell/hspec-wai/Manifest
index d4480f215e3d..bf71bf2ebc5d 100644
--- a/dev-haskell/hspec-wai/Manifest
+++ b/dev-haskell/hspec-wai/Manifest
@@ -1,5 +1,5 @@
 DIST hspec-wai-0.10.1.tar.gz 7979 BLAKE2B 5972f55595efa643b3ff0c2a3aafc213c23a9bb26841b8c0beebe9a853311edc22337d4496641829f6c0856e079ff8fe9e5685aa1b4fb65570618aa2683d0163 SHA512 9a599411e79ef056a915494f7bb247e61f94a5243cd7fde3f6651f09e2b6fc28e99554f1721717ee45f06b7029502620d6fdf1624e280442333224147320508d
 DIST hspec-wai-0.11.1.tar.gz 7899 BLAKE2B ac21a945bcca7c1c42a2e507b66306e648f85e90df8f4d8210f187b10124a12bfbd5e7e13c61631d82f8bb657c6887540e5e605ed9962216823ab56502591be5 SHA512 c5c72dee572f6fd7bd80f3beb4e668697d58f3bb045dabb321e65098f4fc3b1d577aa32e5fe607cab3e18433627538582b6c7acc7bb4728a99daeb20afe41b0a
-EBUILD hspec-wai-0.10.1.ebuild 1004 BLAKE2B c69c6c4074d08a9b34e97885fbe0379533ad0ef3d7883665b19d72696572f628299d3d0d31a186939811f0643b79af534d3a3225b41946d6cad962c2463b7e78 SHA512 157fb66bbd7f23c3a35657b4e9d21e26dfb2bde4e045b6cbb457bdd738d424a48c9fe543e73815681375eba0432566582bcc1afdd693b48ff122d04f1dcd61ee
-EBUILD hspec-wai-0.11.1.ebuild 969 BLAKE2B 382158fc7b6f56637c639fb053690f24a24a690aeaca03c6c7d5f75220e38614349aa155ac0adff51b396fec8d7eb80c0c4ac2301f76f51e9e0dba1b6b0efe85 SHA512 ba90fa5f3ea679dee967f33be3f1cf454c0c9fe371a8fe6da2788b0ec725e97c6dd23a8109ef1dbba343743c7d109b16f68af58de3f8943b9ea65530504142ad
+EBUILD hspec-wai-0.10.1.ebuild 1021 BLAKE2B 154d4f87fc527af6a361fedb4c590d94f31a590416efea3427d247392837ad629793ec6e0b29c07453275c88d3695ba6bef159ddb17f6bdb14eb9293f0677c9d SHA512 6b8978c10917b6434cbeaa773ee37aaa6c60505fa1b6de5d72db647b664e9cbff238d87efc6e54a10fb59e9e5169c21f96c67e93181665795d84ab3b4b22e566
+EBUILD hspec-wai-0.11.1.ebuild 968 BLAKE2B 4a85aacafd3a6168c8edc0b852b0c30077986bbfdad683af6fae977884c45c14eec90cfd26ddd4b0af7d5a007b23163b45bd1dd5e1ea13ddba57fe0874e219a9 SHA512 ff4906ff48427cb5d1b9a76dca4c786965a534a4288a37fc77c860d1b721c4d5034f99e3c5ac7040c11e6502487954c94aca6cdd245bf5a8c1c553d9b2c0780f
 MISC metadata.xml 380 BLAKE2B 5ebd3fd186951e4c6241741a7f46f171c6ff791fdd31ec3ce8594aa38711b7b386e0e84e02dc351329bccfaef018e88a3770652ea2a58ba01499c2d4dd4793ed SHA512 fd2f505747d05bef515e353e02baec561128bf9d592959bfec32c84caa073ca281620e8bf9079a764e59100cff2787a5ccc62bde4496a6d9e90d26b8d228b35b
diff --git a/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild b/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild
index 161cfda69aa4..2113672f6249 100644
--- 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
diff --git a/dev-haskell/hspec-wai/hspec-wai-0.11.1.ebuild b/dev-haskell/hspec-wai/hspec-wai-0.11.1.ebuild
index bd1f3b890a33..2dffe8d9ac75 100644
--- 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?]
diff --git a/dev-haskell/hspec/Manifest b/dev-haskell/hspec/Manifest
index c1139176d270..6024de1de1ec 100644
--- a/dev-haskell/hspec/Manifest
+++ b/dev-haskell/hspec/Manifest
@@ -1,5 +1,5 @@
 DIST hspec-2.10.6.tar.gz 10847 BLAKE2B 3ed8df690cbf77319aa6cf449df462f3bd5bbeefff31f220a9d4ed4af51fb30d63e0589559718dbbdde07708dd5d3e668a5986575b8397182b946f2641196b15 SHA512 bb20b02b22b8b6dd2cf64141a0738ee786278514fadd9e81712e5aa9e3d25d63b1cfdc89199df34b29c749b3f958f26a660116ffc10bbf6d0db0e7ee97aedddf
 DIST hspec-2.9.4.tar.gz 10117 BLAKE2B fbe881a560fc015ab4b3b3d81710d9fa758e65fe6740aeea5273e02588d373cd83b64cc7bba870bcf943787614681ad9a139912c3cbe04e9e822b8cb24788e5c SHA512 648fd812f22613616c1f81206e8bd0ee3bbfe52a4e367344887a832b56317615711aa401c1ac6dfab46f84404885e01065d91e154b9136bde041cf5e419b01a0
-EBUILD hspec-2.10.6.ebuild 708 BLAKE2B fcb070e304961669d7b4bb504eeaac0976b35c665443ea4cebbee2fe4b3b28bfd6847165bfa6a167f688004d1003b5c534cc3eca51b74427b08933065336e040 SHA512 0f9604905db2020ab7132d72df6c6ed6ad3f41bdf0b64b67cc8a9af2e1c6430b318bbf5581bef097af037d3b9d3904aa136e1a2c86a9f27f66b69b85ad8de425
-EBUILD hspec-2.9.4.ebuild 769 BLAKE2B e980324468a3e3ff9f9e8ffb2a67f5a8f01ab4f10e560637303ce7f8d20ad9a69d4284632cbddad0c1fb854880fa83ab76cde1c3eefdcfdb6b87787bbc6c317c SHA512 439994bd66d9b030808c14c7927b1cdc5ac0ebd9bc44b3aadb08d5f16165cc3864c2f8b8ce60dd328a2359fafaa927abbb605810781fbd0c3e0af271b776a983
+EBUILD hspec-2.10.6.ebuild 707 BLAKE2B 1e325e8d9cd3cd478d3dbb0cd20acb61d05b3d52ff399e5e4974fa2c6daa1f8c3f8cfd8340f10901d15dead7f30b619a36083d699b7a820693475c4696920c83 SHA512 697e184cec68177643428cf8d549cf124755a912bb730b6351d494a4ce0d74f8d6a9bed8d3645a4ec377e39482a56df2aba67e9aa2691f9084c437c679b98860
+EBUILD hspec-2.9.4.ebuild 768 BLAKE2B 84d8b2892826994d509c277e4fb6d61162b68cbc30f91dfc8dbfa02b21291e7ccb50342f51c6d51cc83eaf2de8df5663e66e04dd1fd71884d859d0acd0639191 SHA512 9d980f603de8e3753514e5cf8ad6357e7c2d32fb6b45af3d26c4f1db494e5b4fd6384bf16e4b8360e0f426d32ed3e0015c947b1c85d03405da2731b0f7b1690c
 MISC metadata.xml 372 BLAKE2B 4b38813601a3af03e39149e8c66a32a7cf8a002d55e5e33cb32b0bd99b078a8d866b01a53e720b99f919f6a57bd6f94aea4b67a42a9e3e7ae67532a320c78e0a SHA512 ba5a99d56ca6971ddd0597c2f07b3ae4a35983d26ceb2d39688233b4d8c2870a388cbc0e39f452ddcd09b0f3edbabf1c83ed5af7d6bcd8730f01db8675869401
diff --git a/dev-haskell/hspec/hspec-2.10.6.ebuild b/dev-haskell/hspec/hspec-2.10.6.ebuild
index d6b7bba75547..f8f9cbab5453 100644
--- 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}
diff --git a/dev-haskell/hspec/hspec-2.9.4.ebuild b/dev-haskell/hspec/hspec-2.9.4.ebuild
index ab03a4c0b339..2f38a5db8ae6 100644
--- 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}
diff --git a/dev-haskell/hsyaml/Manifest b/dev-haskell/hsyaml/Manifest
index 145c508bb1ca..c885f0d641a2 100644
--- a/dev-haskell/hsyaml/Manifest
+++ b/dev-haskell/hsyaml/Manifest
@@ -1,5 +1,6 @@
-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
-EBUILD hsyaml-0.2.1.0.ebuild 1330 BLAKE2B 92ade5fbea8d7a8b566ce7c19255d7c03ea8f57720d36e6fe73399c52a99193216860ef0191a288583d7cdf236ea9615c66ca93a102b7bcbdd6120b020ae9d70 SHA512 2b722a6d0b8df285dff6dc7c627800ff9de7a4cd1ff871dbd4728fbd086c512af0669c81db8154cbb2416c1c9893cf65a8254b9aa52f3d17e56687cc21388bb2
+EBUILD hsyaml-0.2.1.0.ebuild 1074 BLAKE2B 839e2d01631fb656516284161e36127aecc56bbd362c46fef3415fe2af4c31845ca3ceddf456e6f6b3fd450ce8f12a994fb640bb0393cbd67f8996600932d6a8 SHA512 b61f5c7e9e7428f782b943ccc7c4a70d041d4f634d45b94c40118840a742ceba905f3f45d4290e2cbfa8af029152e653c6b041e6b2448716585bbfe5e332e98c
 EBUILD hsyaml-0.2.1.2.ebuild 1124 BLAKE2B da7e0b1ca373d240893c38136a3634af74bc8558fc584e54d28f2b462645c4a9121bbe762475485c2933b115751903aea34bc517058abc2098829cb231f9bf53 SHA512 f845fdd861fa4be89ccde3c4afd1378dcfce86dc8516b1adc8461aa635b0842f7dd88853e2b3556052a8f7554ab6c6cb425fa688a92d6761be6500456b629b35
-MISC metadata.xml 454 BLAKE2B 1c3a24fa12d19087e4c7855b78dfc46e4076e72b6b9a2494205e5958147cf062c3a89be33ac6c44eee27a2633297249d05b5e735e1c8aaf8d4dc730f10797312 SHA512 e993d5d58ed36c547280a43d0295a4ddd87598c1d5f7607e040ac7f663559306d6ab233bf36510b138df4c2aca7814a2378335dc50318c133fca7fad8c2f10cc
+MISC metadata.xml 446 BLAKE2B 90486b77c11f667410827609216afce0f968dd76e75758ecc3ba44aae1957a340e048f252a748494a46bfa5e397afbe4cd004fdf8587908fd6d6ac8c6d490b96 SHA512 c708b7a201b0821848854e95cff568bd4fe47f819ec544b87b0fb87f838ac586ed430241d948bbf4cafb04ca64c5b049d1cfb346dbe51e7c05350a2203c861ff
diff --git a/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild b/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild
index 4602f8d4b850..12061ee0f047 100644
--- 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
+}
diff --git a/dev-haskell/hsyaml/metadata.xml b/dev-haskell/hsyaml/metadata.xml
index b11316eec0dc..a72f234e538f 100644
--- 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>
diff --git a/dev-haskell/http-date/Manifest b/dev-haskell/http-date/Manifest
index 44698cec7b21..86fcc73bb9ba 100644
--- a/dev-haskell/http-date/Manifest
+++ b/dev-haskell/http-date/Manifest
@@ -1,5 +1,5 @@
 DIST http-date-0.0.11.tar.gz 5351 BLAKE2B e9f9ff3323895ea90fd98625af7fb5213d52303e2b39a661617d7635db294ec256470d6b4dc6d6c38fc2dc7f349eb3a9d4018358e7fef43b966539229ef779fe SHA512 dec4f4fc5f765887fb884a0309648dd3336e2591c05ac89150c7ebe935d1167f3c5996a12c5371f3fab3525b95ca8e46873b6bafc1b937b1b5367c256358a62d
 DIST http-date-0.0.8.tar.gz 5322 BLAKE2B a88ee8ff31e5356aefa095d5c700e77554657a1102ab12091debbe173dc8b8886b3468795117b81ac745c08511b5b856ee49f6754db265226bd375926a68413c SHA512 7ad48dc20c62fea21aad0d15251cca333b56a59ca13c45be61fd9fcd938e28f5cb82701b7a394c256e1487679d0bbfcf994de90d7c8b57888e3bac8809e97114
 EBUILD http-date-0.0.11.ebuild 804 BLAKE2B 7587996d6f5408635b1997cfdb130fbf1f1117ff6ebbb64f9109b063dba836a1eb73521fdf3b41d9938b845c864e5076fd6d9df4938bacf58ce768c01f860257 SHA512 80ea557428d2d042d653f38c5dc17a0e5aaf5657318c52f03c40e1e61f1ef964874172d42079ac2049bbaddd72c279f9392e8859f9c58a04c0728e62369a03f9
-EBUILD http-date-0.0.8.ebuild 805 BLAKE2B b3ba01309f14c4fa06cfe70de7602204f51cbfc629dadd8f2fc6cfabec1a9201b6352dc5bcc25f6e154bd3935d35d11c5cac56de55005ce49603c7ad49d88aed SHA512 91fd2174f08987d2553a370d4ed5c5ecb42b41ef24dc3bdf192d8b9ac5824c585fa9d9cd338d5e85f4faf2abecbe0fd82873c28a28ec4405199a6033c231074e
+EBUILD http-date-0.0.8.ebuild 823 BLAKE2B 7fdf5178f22d7d81697909781a1303617f3fb3773023fd03a0657708e93dd030be035c14f70f1b3e81206544a2a39ece31afbf16e7313e5c1b5d6b9b61520044 SHA512 1e5d43035992affc1b69c3f28e32989e73d1e53ad04aee3dfcb040df2352d06acbc34376112b0d4df1d4452140d1de136930e507c020ffa90e3afdba2e19206f
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/http-date/http-date-0.0.8.ebuild b/dev-haskell/http-date/http-date-0.0.8.ebuild
index ce23a21ec32c..7ffa278155d0 100644
--- 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
diff --git a/dev-haskell/indexed-traversable-instances/Manifest b/dev-haskell/indexed-traversable-instances/Manifest
index eac288ad2fbf..2cbf039ee29d 100644
--- a/dev-haskell/indexed-traversable-instances/Manifest
+++ b/dev-haskell/indexed-traversable-instances/Manifest
@@ -2,5 +2,5 @@ DIST indexed-traversable-instances-0.1.1.2-rev1.cabal 2536 BLAKE2B 31012e89159e2
 DIST indexed-traversable-instances-0.1.1.2.tar.gz 3769 BLAKE2B c45df13fc334e928df402c3bdc76376b27bfbe5bc3ac0a279499e27a9d592d2fd4fc2e8a8f42e2b8bc0d5ed822f5db4ae1a9b4960f0718ab5d093d506ac8a9e6 SHA512 8e4e53054105155e2bc6637348f91548e49c422c87de659193aa917a1ca69e5b157c30f5bfb213661112d28185f87bb9cc453a57e5960042c82b5654d444ba1f
 DIST indexed-traversable-instances-0.1.tar.gz 4235 BLAKE2B e6ae68acc5c6424fd7b9bb045bcafe2d5eb158bb10bc2bd2c677bdd4471dd679a90d8d79628d278a1ade1f0a5940a0e17720fce7c123b89b0c79640497fcadf7 SHA512 ff27968b32c6f0925dc8959dd1b185d75811d2bdb0946818e4f7062e22fd71051c627f2abf943b05b40c85610653098b1f9780145a6369231635993fbedd29a2
 EBUILD indexed-traversable-instances-0.1.1.2.ebuild 1326 BLAKE2B c394f60ef099d85b021b72a3d5238bd94b256a989356114214bef7f38a8df8e1bdd7496fd4f9059a3b39afbbef5cff983fd754c1df8e67154e8aeab09ed35ede SHA512 634a5dbe887833545d7e3f4fce69399e96226cdddc7e603320ca1e559e283e60bfa63492b3164c6dc23a12ab032c7f959b88a1743e4b3fa06b5d0c0b644634a1
-EBUILD indexed-traversable-instances-0.1.ebuild 1279 BLAKE2B 2f29dd0d2407f0e58e36e791f47b2001d81c7fa6dd142ba7b40694407a62de657c932c72b1e0e8d57b803e7213ea0b45625f2acae2ba338471e84bbf77a471b7 SHA512 8191ada1ccc30329e0948176822c21bab647f92aea776caaffff08d71d359511ab46ef0a0e154143a29ae1fbc14a116bb38c8d4f2f7b86e95b79181284da6e70
+EBUILD indexed-traversable-instances-0.1.ebuild 1355 BLAKE2B c7aac23ac0f71426b655083d3b75a7182485d2d62a6a49ee0e146472dbed768738e42cc4496a51631abe4243dd807be6008d6408f954300dedba1b641d93107b SHA512 5918df128d3d400f0e9b1e8e98af91fc33cb59d097b56511f060468e6d969bd5cf69ae8c66fef37ef538cee6501ef297fbce16ce40066c0a3126aba39fa75d57
 MISC metadata.xml 415 BLAKE2B d3aae5d4ebb15f6f8a794d55588525edea5177bb1abe1d38b5838a39ab36d80a2077544c3431f66195914d6a2a4ac3691533fe7ba60ef35bc0f635245208e729 SHA512 9033e9c859a48a1728676755611722e1985a526aaf5cf1bf3b9af58f181e5ecc8707524760cd6477428230354fd5692c9109308d8c9dd76775c910e5b51a8d4d
diff --git a/dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.ebuild b/dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.ebuild
index 92bf5e8c6a44..ce00ab299a4d 100644
--- 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?]
diff --git a/dev-haskell/juicypixels/Manifest b/dev-haskell/juicypixels/Manifest
index c95f46f72f3e..b013a668a09f 100644
--- a/dev-haskell/juicypixels/Manifest
+++ b/dev-haskell/juicypixels/Manifest
@@ -1,5 +1,5 @@
 DIST JuicyPixels-3.3.5.tar.gz 131914 BLAKE2B a541f8052952e9a757fecb7168a74b9cb6aef152a1913aad36ac47d4ea2dbdeec9c644a0d2edf340986bd179ba4e925d3d284fbe73725e149e2b87866a8a5865 SHA512 40ce63d01fb4dea77caeb055cf2f9f16b32252c7c5ea501b93c9020e426da9ea019b6e618da373fa41bae93789b76561f2b091bfe9340ee9c75f4d8fe29f90ed
 DIST juicypixels-3.3.7.tar.gz 132469 BLAKE2B 06b58a9969b084eeb4bea2b4e88691d92d77ebdb30fdde944c90bd4b77f780d52dd3fa1f44e0415e71bfed29c5259ec65c434f04075f02935fe052236ac1f4b2 SHA512 adb3ccae12524ddb6f2736d65d14d997e1d672960b2fcc02739742fe18d748497324c9aeecb0b0b5e7662b218c5db55b2e8f5639e6438e0b8a45960c9c0e7da1
-EBUILD juicypixels-3.3.5.ebuild 1022 BLAKE2B 63ee238e2f1ef81e8470a924f25c684275b6a9edbd547b240c8a7a92944899765c610712b3c2647789f06ea2e93b741534fbc5320125bda642a88433bf0ce5b7 SHA512 243a43e3809dc6956843963f6e7c1cccde3ed49beefea977439a4dfcf4e0237f7e866bbc9af4200446377529812444f902b8d622449e7b8310d60cf9b0272f26
+EBUILD juicypixels-3.3.5.ebuild 1103 BLAKE2B 7c64dce54f2bad44293b94ca02ed7cd99fd3b0a161fd6711c039b03d5291f52f0c8e1110ed9744265b9ab24c61e9b34e3c4b7ad479ce7f3a66a55394c394092f SHA512 f7a02c3cc0666b701ee6718bf929cdbb926cad3f7cc86b4dde631fb7aea5b78c41523c3e78d1e6274efa3adb045207249a787f51d2445ab4570a55f39152bb76
 EBUILD juicypixels-3.3.7.ebuild 896 BLAKE2B 06ad223fb07bd702f5067c22f3a75ba503dffdb5e52b397226404bbeba2c033c6abd3c6de89bbc772a0e7cbedb142aca2524e7c7b38b9563c91d96ca6282b9a0 SHA512 d3faedb4941ed65572ca9ca27ec970a367d1beb7d218e0a27694c4df62846b742436a2fb3b5b55bab27c3e2fb2b556a00f03deaf22cc5b66d12ea647675042dc
 MISC metadata.xml 476 BLAKE2B 29233847e893280bdc5450834108662bdb7cb56b442bed6fce575330588b80c17d6e03a7782d8a62bd1597966ee86a6282ea584441338a7d0259743268740efc SHA512 c38f29cdcca59738db2980152264b1a22bec7894c4ecfa61a20bf9ecef4bbc2150e3b15f545a65e7eecb217dd994ea60486429de86c29b0b4b54ac6623a9152a
diff --git a/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild b/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild
index a9be7e744407..730b4ec64d54 100644
--- 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?]
diff --git a/dev-haskell/libmpd/Manifest b/dev-haskell/libmpd/Manifest
index 6d635a37f3b8..d6e3e53e104d 100644
--- a/dev-haskell/libmpd/Manifest
+++ b/dev-haskell/libmpd/Manifest
@@ -1,5 +1,5 @@
 DIST libmpd-0.10.0.0.tar.gz 43455 BLAKE2B 1afacbecf7c36f5135b4d4811d38a45841143a87224a7701a1f426b7ec624251e4314645179b19c5743ab6a50d8ad04dfa5c393ac5c6a3c10e20f0baecfc28d2 SHA512 33b2af4cbbcc2c6bb2f05ada685d8870ca5132559f8f0505da39f0deb290f1e15028d783c9b28fc51f785ed86878fbf40bb0be0487612cc2b600eaf619114c11
 DIST libmpd-0.9.2.0.tar.gz 41824 BLAKE2B 1788acb7e4152a9612a8cd503ac9751a5165a80044f1470bb4b6b055e9a52b538c9bf9cd5f0d2796e08f11e1c7a80e2739cbedf6869e1929a2f27fda08ec32ae SHA512 44b09e239a757308e59434eec80382465b684c9a00803c917194268a5b5b548b9da8e33ead8582c2a797badd0edb38846267009848a4f2300098adda4004aa18
 EBUILD libmpd-0.10.0.0.ebuild 1012 BLAKE2B d6526941ec4140e7a0d234d5bc51a9251359c8a366a077b0311130eca5cd7a2d48260f0cccf7654ad085d7a0e6fb63a447990a5afa3bc51a7964931a84c97297 SHA512 96861d5a3099b39095f06e333776df6727342998ae02f1ea515a8030d7a9865e6f0fd2a9524dcbb1913927e790b61159ce3b04a4456fc165ff0928a3b5c1fdb6
-EBUILD libmpd-0.9.2.0.ebuild 1249 BLAKE2B 704a884c7cc6b763b59312da23c5740a544a177d6aabda8e3834bb19eb6418f171e9297604f8fce40a4879ce179e9ef433f5c9115fe884fc7f624d1d0f0c9f76 SHA512 699ca7fb97ddee0cde88319a4f179ce60a1ae31823eb32749f306d45bd0bc9f40769257d3398d4ecbc1c07c87dc846979ca0ebf8329597a5e1027f7986ea4f57
+EBUILD libmpd-0.9.2.0.ebuild 1267 BLAKE2B 8c573777786c8b4cd90b30139f61f886706a3426ef55042f06c96633004dec598d212cda5ffe1f2c3f7fc01341dafb6a3062fcec9bad02f029bb04b3b0e55187 SHA512 b876452465f208250b30c6daf9aaf60b0e94ecfb1576e5f3121330f96c16d1b4a8e691b4887c5c24812604f0fd216f77e206be4b7d624fa993ef503c024e1ec4
 MISC metadata.xml 382 BLAKE2B 7228c25739a783f7f6b1278fc74c53846fd1911297dde22a221969b5d3fda454c4727b91dadb72b8aa6899eb16d20fb44408d8bba94bd908a85a46275bc3e68b SHA512 f6db078aa2b89c6b5c4e7f0aafc98ec9b066ffd9846e284c9c6df55a6bcc030109ae1c02494c6d5a6c9af9c585c285c506758092c9a57310fd6e534479809c5f
diff --git a/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild b/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild
index a3b358b2d75b..562e8233c931 100644
--- 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
diff --git a/dev-haskell/lifted-async/Manifest b/dev-haskell/lifted-async/Manifest
index 75ab16c4a811..63a63709c7f9 100644
--- a/dev-haskell/lifted-async/Manifest
+++ b/dev-haskell/lifted-async/Manifest
@@ -1,5 +1,6 @@
+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
 EBUILD lifted-async-0.10.2.3.ebuild 1130 BLAKE2B 65d3b1e8045b227f9591bb6a882e0e36d34f431580eeaa4d73a8d3a18a041283a7da5f912845f63be8f57eb98858d87468bd32e9bee215074df2494cbd1f5377 SHA512 cbd689fdf94c349a932d82fd6dac5a5d417db088001a881e2f0879149f4ec4de5780501bd69c443c5cdcce800d5b6d7819b21835f6fe31b46c9abc5813fbb4c6
-EBUILD lifted-async-0.10.2.ebuild 1213 BLAKE2B a0db97d14ae0dad8d439880c3d92e1bead5811b426d65ed7162a4e15189339fe39422421fed90354de9c93a11923657c25c2b5d03e88b765b0c96128de27f837 SHA512 f66d4e41916900f9c1392ad913a471a045ff6c3af84b6b3ff2195dc105b1642b7ed015f03c288959ae65d456e720704dda5c9d7746d01b2e09d417f443045586
+EBUILD lifted-async-0.10.2.ebuild 1217 BLAKE2B 96df0a75bece82450ea5583b35d6d7d3d070d8ee4ace778966430971a9201791e499049659351e165c05b462584fe0e0fda40b559d8b1571141a534379dc2c0a SHA512 f7a0648f9f3eb1e5d03bc624e41c1544486d938d37073c4b4da807019796fa7cdc2f1c3207dfdaef6739466541f26a7faab3de3b9324916b109974e189f73db7
 MISC metadata.xml 385 BLAKE2B d9c4dee6b2e31162387873ac0022d7202bb9a730ed306dda087230bb4dac48b60ef1e92733799519c51cffd2c485ba4744d1f7502be9dff6370050c9b9846944 SHA512 73f83a184596a35c10e5650c46b277fe177cf19953e4dbd84e39e098b7bd2227ba9f28d8cdf53e19f0902ec8ee95f66b942440750a7b763ca594ceacab67d718
diff --git a/dev-haskell/lifted-async/lifted-async-0.10.2.ebuild b/dev-haskell/lifted-async/lifted-async-0.10.2.ebuild
index 969bc7417d56..f90e56840529 100644
--- 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
diff --git a/dev-haskell/lua-arbitrary/Manifest b/dev-haskell/lua-arbitrary/Manifest
index 2c05857db4da..b54a764b8ec7 100644
--- a/dev-haskell/lua-arbitrary/Manifest
+++ b/dev-haskell/lua-arbitrary/Manifest
@@ -1,5 +1,5 @@
 DIST lua-arbitrary-1.0.1.1.tar.gz 2487 BLAKE2B 978fb3f94715211cdbb22e89d05abc9fbc92b713237e5d87984f7bfc27b56f547c754d62aaf1b23604de0769382d3d6e52bfcb63ad2af2e900257b8e139c1cde SHA512 135c4e16dae746aa06b7c6f217f7beb99f6e70ffc7f20ada5ee09654827d104a9e653317dd10cb615b404419bd76574b7a3f75f518a4ee560d2fcc9bae26113a
 DIST lua-arbitrary-1.0.1.tar.gz 2479 BLAKE2B e61c8eb60bfd2fa17f253baced7aba296ff79fa8ac930ec3616f7a8db818ab76f0287e99089d61abad1eaf573e522e4456c71e8c7ffc38b675c0dcf7cae3e95f SHA512 09de72fa62600e1b1ddc7de8f51bd6a429bff9a51347c36c2c9d67f0bb25eb9d6105ff7d08717f3b823a63f6fe60c8e4c9620ad3645f285e38126ec10ff5b402
-EBUILD lua-arbitrary-1.0.1.1.ebuild 621 BLAKE2B 825455a84c56be53854910f94b2c7b73bd21dfd2dc02ec7238a8cc22bd47b8310895f50a59462f0ffbd35a5b2d748c6ca7838aa16ab928bf22b94e50e5768801 SHA512 aa28ca294b25cd8f7291628aaaaa468dd8195e040b6f9923431f5602de4ea619b7875d05c3237ae048e7c8f056a76df2a28f29ea59d3b849eaecfdbf3a5f4e6d
-EBUILD lua-arbitrary-1.0.1.ebuild 683 BLAKE2B 027ce02f15ac45ac5c1adf47e980be1cc03f464b2fedfb25e20ae4038651d187fb0df76a1057e5c85bf5ec7a4baee133196667495269f749b23000d2e74b6c1d SHA512 2d740aafcbb00062733edfef7b5d2dec46ee80d84e718dbc75f7eef7581f566427cb553c1653602da1086cdba32b8d905d91a63fe2340ea9080c297f6a0c3920
+EBUILD lua-arbitrary-1.0.1.1.ebuild 619 BLAKE2B 324ead31a41e8dd2e7d53c8997d69bb0123fd3cb9ff5fb30c31b54383317ecc7caf9bf23dd1517d7c94d117b500da0d3d047719b484009feb1d99d4915d1a621 SHA512 d95f39f9f5847954645a93d06087e9fa730c1a34243b2f727e06e40d39f601aaa48a3271a58fdb5b9ff7b0b7be665e9e2eb21e27a17f000f3160c8ab6d8304c1
+EBUILD lua-arbitrary-1.0.1.ebuild 681 BLAKE2B 65d33b027910fa3b0670dcbeea73e603db205aafbf847fb5c0b0dcc7613764b5179165976efe4268fd36a38062eea0c518b913b7823dc841466a15fdf95ef99b SHA512 a7044b42d3b254c33cc9dc2bd04efb183f6992cfe20243964b50c9351fb89bb483f7d0c031d48d16ab652e659d185e859dcceda0a8edf2d91c365e131ac7846a
 MISC metadata.xml 380 BLAKE2B 5961d17f66363d470102f2a5616e941f5fde757b6800f9eb0ecb4883a2e4f27ffa8acaf67fc0e2f6d607705ab2cb9041f321dbd670c6848a19ec3584cfacae72 SHA512 8ee990ded2ed5bf715498b1b460c8af47f2ddc5822f0957dbd5722ea85c1ad2143186206d61999df14f912f85aaefd5a20d06a224153f7e973dc84d0b9718fbb
diff --git a/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.1.ebuild b/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.1.ebuild
index 8f700db46f8b..9dd27d589e9e 100644
--- 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}
diff --git a/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.ebuild b/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.ebuild
index afb772c789d2..0451a2963615 100644
--- 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}
diff --git a/dev-haskell/megaparsec-tests/Manifest b/dev-haskell/megaparsec-tests/Manifest
index 0283fb7c88f0..6ce3de2523bd 100644
--- a/dev-haskell/megaparsec-tests/Manifest
+++ b/dev-haskell/megaparsec-tests/Manifest
@@ -1,3 +1,3 @@
 DIST megaparsec-tests-9.2.2.tar.gz 31021 BLAKE2B 872222cfe08fc813445275a747c61e3520b076b3a3f6454f5f95ff91cd85f5ed91b86a2273ee4198f6599d6359369ce410cb6290f66cc7dd9e7c9c3f499fa5c5 SHA512 379098b9d87900540c82e3ae17c2d930ee11644f20535e5eb1730159f59a6dc7f181ee6a022a93893b37ca063a097bea0bdecd1278e7fcc581cb7e95b93c665c
-EBUILD megaparsec-tests-9.2.2.ebuild 1209 BLAKE2B 3de3f745e2bf891e74508124b21e6eb1400243adbaaf87a360116a5291f73bc92b5360002fc957ed8b9d2c554dd210b335c0dcb8bd5df7b024afafcd8e79fd32 SHA512 4a63828de455a54d3f0ac632223d2af6afca4a80266aa0ab63ab5ffb3e14557b07aa0d525114982b1d77d313bc631fb5579f42d0a7375ae7125313152230bcec
+EBUILD megaparsec-tests-9.2.2.ebuild 1207 BLAKE2B 81de424f379563c0ca7f0399a97fa1b90abac9dca5d4fa5f7f79d5db65a537461f0503980878269a301c427ab0494c4d1b2c5152cf927845f3c7d7913ef71f65 SHA512 0dcf90618aafe6fff16fd95e26eec16cf0d7371746b48e09a29912de47fee1a8043430c92c766c2c8bd96eb0b979db0796542d6fee7c441720956bb21ab272f4
 MISC metadata.xml 389 BLAKE2B b001506512e2d41ac60f28616a5d30f26ce4cb5796cb7f0147fba009ffe8b4bdd8596ee0d2f912881ab0f60359997ba6f64e1d6b8ae2a6a6243178572abf35d0 SHA512 7ecf212e9ac6e1c20fb288a31251082b92e3531705a3b390bad4c741d7ac84dc02510810d8f099865989d4acc3cfd8045b5f1c91728d1f35844bd042f403ced1
diff --git a/dev-haskell/megaparsec-tests/megaparsec-tests-9.2.2.ebuild b/dev-haskell/megaparsec-tests/megaparsec-tests-9.2.2.ebuild
index 3e3db33603fe..b6a1029b9e53 100644
--- 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}
diff --git a/dev-haskell/memory/Manifest b/dev-haskell/memory/Manifest
index d087176c3d79..f57ca1438a08 100644
--- a/dev-haskell/memory/Manifest
+++ b/dev-haskell/memory/Manifest
@@ -1,6 +1,6 @@
 DIST memory-0.15.0.tar.gz 42299 BLAKE2B fd4cebe132ebc824e88907325d6106ab62d01942f5055481f0ff85248ba1a84211e768e49409b02f45ff224a4149338abb771b1dcad38c31175c340e35063fad SHA512 49aabf5fdaddae597df6d8f30a3e07c4d6d70fcc7b9146452a4ad4e81858786041676bc780e2b048fd683cc7c0d799d4579596c14fae940ea57954e9a7ee9129
 DIST memory-0.18.0.tar.gz 41957 BLAKE2B 606c197b7ef5ff8189c0ce35b838a9866b9c7996452f77aab5d7632ac5b6c97d44a8a75c3d7e7f707be5fce70de91ec4db727c0732b2a6225d58ce1a8f8dd810 SHA512 5f341dfab54d3f063ac34cc092240082f885f7ee5a23b3b3ed8b58a741ae238df289ccc7e40bbf52f2ce19c4f7bee186e7d9ed6e207e59de6758a7eea5a9fe85
 DIST memory-81.patch 4543 BLAKE2B 451af2f23cd975403604f40129c5112f1f1e2856ec90c34058cfc6c97b5f84069b6379dd49d9167ad6e25365035470a0c20d76d4d441f26c6ac283b7999cfa44 SHA512 663672478660b0c693ebf41cbbb1ea123857b4f9c10560c4b0faeafea2cab49291daa99eac623a2c0b8541bcff3285a8837f407a61bf3e83084170c63d111a4e
-EBUILD memory-0.15.0-r1.ebuild 1047 BLAKE2B 2e9c07924621d585cbb839190a84f3c346d86e9fedcb75013734638f27d19c6ae18bc405d5f4c6653fad2afd42efe8a4699c9c38c1eb00fd1f4441fe40b2a5e3 SHA512 e34b69fedfaf1fbef6794765d2e4fed5a91134d1956ff334532204bc1be74711986f06f0bf82355af4cbdfe99a35ddd58da8e0e1695a5156f66bbee3cb4bbe9c
+EBUILD memory-0.15.0-r1.ebuild 1065 BLAKE2B efc0ae8f31fe82354a1550ac0db4f1a6f5ff6a25aafcfbd7355fb36f2686757d28863822aad73fc3dffdff1f44a6824d37f142027836964a6a756c9e7b75f060 SHA512 b551c9e64cbfe3988ddebabf1d878f0b08e785dbc2e609551358594b46bc23feced18c69069a3c2d6b54d3919de2f139f70ec6266490d70dc45c7c580c2d9b73
 EBUILD memory-0.18.0.ebuild 844 BLAKE2B 35b76a5c1bfd75c9aaed4b558185ddaeb9293e5da654f0cb3edbf143fd602255bee0ecf4bb7a16980aea14d1a255cec78ab4f689e18ceb12a49ec73a9e35a978 SHA512 a0c0118a0024687aa8971da55229ab8ffeefcbf63c70518e28331839fc778079791daf2a12781965e282b2072aa5821fa9b27540afdede9047d518e28d461ed3
 MISC metadata.xml 381 BLAKE2B 5d0d3c612d910555b17290a5d877724762ea55482e2389c8efe144ebc46fedef594d119ee5b7a43b7797b76dcd3c5b50139204f515613c0f5da65a7141556971 SHA512 b39b460a8091cb2ee369a9e4713dde9bc6f2471bf350d38fb1d0eb31c25fe1bac2c7164bf2aabfaeb2ca11bae2e27de10440bbb2a6db9bae70979b149ce28a0d
diff --git a/dev-haskell/memory/memory-0.15.0-r1.ebuild b/dev-haskell/memory/memory-0.15.0-r1.ebuild
index 9e74ec909bc1..2029df86440b 100644
--- 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
diff --git a/dev-haskell/missingh/Manifest b/dev-haskell/missingh/Manifest
index ae9096b90f72..0df2cc63ac3f 100644
--- a/dev-haskell/missingh/Manifest
+++ b/dev-haskell/missingh/Manifest
@@ -1,5 +1,6 @@
-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
-EBUILD missingh-1.4.3.0-r1.ebuild 1753 BLAKE2B 4a8b7bf35f59fccc4d50c40fcee1afa6ae3ae805380dc4cd15806001aad9b69f3add6442437cd7cee3f0e5f67c791bf97960a9611703a2729cc3cb461e3871c8 SHA512 7dc084ba146d03f11a5aa2553ece17aa64fedb30c8700c32fca8dc82465947a7d2e3f356e0f94551185d6ab14796918992e5a10c61631ec7e0548c11fceb8d0b
+EBUILD missingh-1.4.3.0-r1.ebuild 1521 BLAKE2B 16a1c061941abf28c33632537f2046b9b99b58de63e374df1b447833536f77a88ea8d11281fe55f9d7c4bd8bc4e2e0525bdfcf9bc151e588842f9de17cf79d5a SHA512 7961c6e831dc02af7e1f680986e94565b696ea432ef8839e911fbb6312146d68e9284a59a6857364ebc06f30277d2d4577f8b46c02a924159da6334a144828f6
 EBUILD missingh-1.6.0.0.ebuild 1298 BLAKE2B fc9442c4f53ef36be3b56a4d917c7159c896ca81b334865ad89672d6d4652ce7bb956034674fde54a1c4ce4dd11092fe95373d488a9388c3be17afc881dc7ae8 SHA512 d6371a32795a780c5d35e2199949e002f91f0f79eb9170c03d621f21157f3cd59d0542aaad1c4e0f5e893e4bc0a38e0bff9464942a5d209d068d783964820773
-MISC metadata.xml 384 BLAKE2B 0c58192da615bb98f75dc0121c4c5d751873bb5db6ca4510404a102c13fb126206d3264228a4500277805404dedd8a705858f93f7c513cd766b6067bd483a7a6 SHA512 3dab89572d6529654c5441a3d3dcb2f02230d9d6c36f4a927c9d0b1498eedaae7a716f985001b536746f7b60b15e7b107a6db17115d870e8c4c686dea6ab2c07
+MISC metadata.xml 376 BLAKE2B da29a745ee5a704b5c8397ac4b5ace4a1eee2bc8e5948789e0d98a1a47fa58f9a78e04459c31e360460895df916822ddd8912a0b27639804cbafee2ac8ad6f79 SHA512 1596bdaa3e7e6ec0567e2472a616e90ecfb64ba2d3564480588900b8fb12da36afb1f3d114afffef07fd54cc469ef621db8a3401d68ec1e6785bf713842de492
diff --git a/dev-haskell/missingh/metadata.xml b/dev-haskell/missingh/metadata.xml
index d7d3cd104993..6b12c539c764 100644
--- 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>
diff --git a/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild b/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
index 300037aba372..3902a1b62e92 100644
--- 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
diff --git a/dev-haskell/mono-traversable/Manifest b/dev-haskell/mono-traversable/Manifest
index ad2f20e85adb..82241ac73b11 100644
--- a/dev-haskell/mono-traversable/Manifest
+++ b/dev-haskell/mono-traversable/Manifest
@@ -1,5 +1,5 @@
 DIST mono-traversable-1.0.15.1.tar.gz 40815 BLAKE2B 432b90de9620b1aadd95e4591f678510b3e878a5af98d12856448e0add928e61bbca3fcb9f4796af0befb0bb70dc7cc8650263abb719e133ca227fcf85b6f0d7 SHA512 adf1af35b93af0605667d8b033415f318c6dab225499fdd1d9eab349fb1eedca2623c98f9dce83f94ed27db75b6f0aa88027daa748c7b3db05f47f68b505b0c8
 DIST mono-traversable-1.0.15.3.tar.gz 40461 BLAKE2B 07a9ce225bfc60f3cf838f5d683d325844369ec5e5eba791f115ce60f5028a737e203113b20b7ad7686eb1b283d5221443eee0e6ff06ebd0819ea6c550f2465c SHA512 55f469149b84ace246e6c0791de25fcc73317152986e4949c7ae9ae020bd6540586da090d58ba495ef7f251c4a3a02979a796af9fde975a54d3d1541527b7691
-EBUILD mono-traversable-1.0.15.1.ebuild 989 BLAKE2B 7a521b60076e9e4a5394ec1b5d2742eb1e02d47e192ec393111df99eabc8b4dc8ab13db3b74b3077e0d42883b908c11068ede0eb9c019127b085496a0cbfeb86 SHA512 dfa1ad3af8ca9ec20f895d80ac805bdb33caeb2fe348c56e3d5d19c35b246216aa337c6eb1ffbd581ec9df514fe7317c0ab28c84e130993b2f1b3198ea7d81c4
+EBUILD mono-traversable-1.0.15.1.ebuild 1007 BLAKE2B c42b547db358cd488fac784d4ca64c6bb066875e35e96a5e9204054a14ff784d22bed4c6cc8eea98f783b65cda186271c489ec2e0657602b01aebebf5447b7cb SHA512 4d92c342daa5654bbf241dbbe73f428f5492a2508b73b6fb8c7273a62a523a5532bf9de6af9dcae991247b9ac43e12e6e879979ae47a3b4149e1a114dcf42ac7
 EBUILD mono-traversable-1.0.15.3.ebuild 959 BLAKE2B 43407f5ce97d815d0ba09af2f59e2432f8412fa56a304728fa5b77d236e866783617b59c6ee1f61dedf4268473a8f5b6c542e9c1961c17a482ab143c6d41aa9d SHA512 b24d723c6b5dc377c49b7ff2c5e531276fa3bec74f0e9fdb3c7f8a923b3580560312fa43d9bf0b495ca45b5b0f50466e46dac1b0e61949e6d325305063bb2c95
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild b/dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild
index 1951801ea8f2..8087ede033a9 100644
--- 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
diff --git a/dev-haskell/pandoc-types/Manifest b/dev-haskell/pandoc-types/Manifest
index ed885e925cfa..2fa5453f7afc 100644
--- a/dev-haskell/pandoc-types/Manifest
+++ b/dev-haskell/pandoc-types/Manifest
@@ -1,5 +1,5 @@
 DIST pandoc-types-1.22.2.tar.gz 35887 BLAKE2B 7a884551a1c1ed94308a1b2529806aee42b9e04a7de94d6a0ded0ad106a6653b9c290b8781ff4197ff86bd132645ef96b5984987206b67173e057258a9fd4c43 SHA512 c4e78de0d6f2df67a716f7e549d629b9ead7f2569674cd84cd73a430c7ee97d1ebe30e0a95e84b5f45dab2a5cee6c6d5cc30f6c47f11859c938c75f63406878b
 DIST pandoc-types-1.23.1.tar.gz 36480 BLAKE2B 7c25cc294d0180c4c8a694b0471e76049ff9236a0c9dcf1fac37e6dbe47f7166948c8468b9232c6900a2fc231fd3210edd32b7c504e58b5ed749ce66cfbc3454 SHA512 c09dd9966da80e7121d2033d175832fef190f17044f3fa340c554b4f3ec1a288ffe3b0bb1c1fb0bbd477de0633adfdf111cda39d2e09d8e6d5019f6c28be3fb4
-EBUILD pandoc-types-1.22.2.ebuild 1140 BLAKE2B 01abc8787ef54ad53a4b5b26fc1c79ba8be644c0ed2f4de30fa453390c73187d279cd90e9660bb5c40cac34fbd08a9e01fe6060866bff16879a4e8829640022e SHA512 ab5f58ffc3488c4b590071c2f895cc73316f847b46a267e15f6ac2acc4d88fa6b74668385d76b0eccdd16739bd072f227d580cf9a3ad00df5b8b62ecd74e6b93
-EBUILD pandoc-types-1.23.1.ebuild 1049 BLAKE2B f26e468d7999f18e0e713c9ce9588d8bc9ac89f0129df21ba0dfab54724406ccae21879d22e245406a23f82b90772adba697fb828d1e5f23cbdbcf3d184dd4fa SHA512 8058139db8685901b1d00eed4d08b91db9f313d3d239590eaf57bf0ab19614d662a9e6ec58f0b2387f8e95bff375cd9af4b68560f5ef1d314a9237266449e5ad
+EBUILD pandoc-types-1.22.2.ebuild 1138 BLAKE2B 840b0e99cf07db268bfed04bbfff729ec30c3466e35fd46e1353777670afdb46369e6974cb098fce82b3a5ceb71a815254bdd31d71b32c3380e960e8de2cfe8f SHA512 9f7da850ecb5bb149a8e0bc08cfbfb5832af43167c7c8b6e029937a6353b78042b2b36576ca199cdf613b72d2b73a34b3832da5641a8a9e7035eef367610e9e7
+EBUILD pandoc-types-1.23.1.ebuild 1047 BLAKE2B 746b90459c64fd69c5859eb3b7c2a91dca83b10f49c12dcd14efe2a05f668ee85728509f63c678c5bd6168875edc0c516ec01425f09de508740fc8e1739c0b33 SHA512 98cc94cf01b595042782af933df51884b2d1579f0a3c4ff696a5bc9725edf3a9e9e256c227bd73ab7515ca5386703f6d8241e896ac148a4914f46b13b146548d
 MISC metadata.xml 384 BLAKE2B 828feb030ab5e6cf9bd6d6e78298812657ff249dac1510017b2902abb770e62895e1a47e473c883ce6448087900b696564ebc88db24cc41d0f4cda2543a49987 SHA512 a0f688504a04ee3c76956f79c983eab199f9d40d2f4f535f614598abf36b043493ad4da89015dc0362329f593180e7852ba35816275997c6059ba3ea4bbda0d4
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild
index 1a7ed7610cf9..0966156abcb5 100644
--- 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:=
 "
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.23.1.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.23.1.ebuild
index d71b49b34b75..e02997758c0e 100644
--- 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:=
diff --git a/dev-haskell/parallel/Manifest b/dev-haskell/parallel/Manifest
index d673d7fbe5fe..3f5b58da2560 100644
--- a/dev-haskell/parallel/Manifest
+++ b/dev-haskell/parallel/Manifest
@@ -1,3 +1,3 @@
 DIST parallel-3.2.2.0.tar.gz 14681 BLAKE2B 579ac5a9c5310ca74b852fcc4d396815fa81603f939149a4c9aa6ca40d24caee9273d77e31a395c1478cf05750f25c63b4561e2eb0f175091c58d0260e6b7fca SHA512 ca1fe3fc5f9478dd52b42243d1191a2327c22946eb11d2d3426b9da2d833a61f182c20af9d15f7ceda6b58a28ee03de8837b6ca5bdd34e7306894db97f37f7bc
-EBUILD parallel-3.2.2.0.ebuild 626 BLAKE2B 1804ab23a9135fd06949c5dbf07b5d422348bc94f7a69bc792b7df18d020e6cd7cf8a71ecd48aff71d58f0ba7f2eb0511cec4bb812b146d8c4782afd81f51c11 SHA512 b2f87b21bbe506ca683fc5afdcfdd7cbdd2e7789beb9ab7281f1045480b28ed26b68934d8878065b35bed4ccde820743f124a261c6ac971663f5a88e3589592b
+EBUILD parallel-3.2.2.0.ebuild 626 BLAKE2B d7ec5c50ef91a429019578827829d658ec57d38d670e5dae73bcc6af3ffea515ab85ff867d8f42ce68699dd5ed6818b354ff7729f6cb121e0251f031b6482e2d SHA512 84c5bab9143980b8150e160b6a506e9bf55d72922e7f5aa3dfd34c7f896d4c88923b4682b0118f428ef6d41dff2342d85c6d8454a0b1ff276eb549faef5db55e
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/parallel/parallel-3.2.2.0.ebuild b/dev-haskell/parallel/parallel-3.2.2.0.ebuild
index 5f601299665e..dfcf7d93965f 100644
--- 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=""
 
diff --git a/dev-haskell/parsec/Manifest b/dev-haskell/parsec/Manifest
index 0b84aa42213a..0eb6fc779672 100644
--- a/dev-haskell/parsec/Manifest
+++ b/dev-haskell/parsec/Manifest
@@ -1,6 +1,6 @@
 DIST parsec-3.1.14.0-rev4.cabal 4356 BLAKE2B 6c0d7b4ae6c2adad8e79eee1f90ce51b6451b5929bddbd553e9a58cf4f9c169d48910ed8a6254afec54c096caf473230ce3f5672da60c4c170dcadfe9e1d1120 SHA512 4f5cef855f39497f7c84cb9f033cde9b8326a38a81d6ed1dab310078a935a14f36aa3f660b0ff1ef73333841c603c4a28237e96df1737de70ba9f88df84780c1
 DIST parsec-3.1.14.0.tar.gz 35688 BLAKE2B 474b14ff35d332339ce07f09ef22cbbdf971de9d9712848eb1c67b7ea4359e46079b67d39f978755c7560c55baf6d5f0d69a425291644a3ff638139a8bbec3ce SHA512 db14f77a2d36da5e540be35f0facb7fa61f2c46057b98039bdf16c06fe9865d5ee47e3523a312201665ca133f3f93855b42f0d0a920b8e233ffc8274075c56d3
 DIST parsec-3.1.15.0.tar.gz 36412 BLAKE2B b7d0b0eb022c0662a023d94e83106a528ed2fe280e3aa4cbd643479045d8afdee66a6dee938d5b7932e823fa39dddff18a407efb03a26d0029f1aea59b8738ef SHA512 fab7c48f43fae2708ee2d345897f827111408f82f4370442047d49d703de5d7a9666753926486764a3cfab15df98cf0f8e37d5b73811ffc80797ee498b4eb591
-EBUILD parsec-3.1.14.0-r2.ebuild 1151 BLAKE2B 45c26ce7e537f618012e78299d87961320c48f016b1ed941db157217a82218e49e677b404f0978dbd9f3bf95499eb9409bd1c047b7c931e4289a7a88780070e2 SHA512 5864fa21dbc29592e114b0f8c0a9817812b62566e5c3511ba278677e4d54cebd0573361a15fadecdaaf7ec95a08110f254dd2d41be841b2b25092061e2a5b2f2
+EBUILD parsec-3.1.14.0-r2.ebuild 1220 BLAKE2B fed8825ce3094cb1ab5e44f7f84866a0db1f778b2332dee10c51826e61ea108b1c55a63eb522599dde675f614491f6ca0587a05d34d6794dfd646bc6e9944552 SHA512 74fad7194b5637b550fdda75deebc2bcb5e6894cb954f040db13d3879a4016f9c8adbebfccffd862ad95f1721036288a89a00bce47353de4d2fcd777eb75f5eb
 EBUILD parsec-3.1.15.0-r1.ebuild 1009 BLAKE2B 6d8e20b344e7bfad575f6986615946240c9da10c92322bf1c058af61d2601c43914d43c90ec99603ff0250e957cdd80f143954f2d4c8d98f836e0723b7d3f0a4 SHA512 db26be4ad12c7065db8a197c499731a20f5b5c0f86c25a061b47b9bb1c370979ec79c5a8a9884c455b8234b180cb69d79c36c9d82c128a0a4b29e640cb468253
 MISC metadata.xml 376 BLAKE2B 5b1739eee86efe0620f806ddf37d9ee18c85467e1a4ff50273b0c42265f9f15e582e98f240e6295842cb32604356c325e376c89a215545d2b5f3dc9935770b32 SHA512 8962b5745d51962551eaca010513fdc7793b80b3f7a559d5b6ed0cf0d5f1825d40014cd4f76342e4ec266a88c20a3b8a40d7b79b19d910171152f3e27342495a
diff --git a/dev-haskell/parsec/parsec-3.1.14.0-r2.ebuild b/dev-haskell/parsec/parsec-3.1.14.0-r2.ebuild
index 3f56195eee38..066780005d1d 100644
--- 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:=
 "
diff --git a/dev-haskell/persistent-test/Manifest b/dev-haskell/persistent-test/Manifest
index 66b8dc01dfb4..07befa5442c6 100644
--- a/dev-haskell/persistent-test/Manifest
+++ b/dev-haskell/persistent-test/Manifest
@@ -1,3 +1,3 @@
 DIST persistent-test-2.13.1.3.tar.gz 32262 BLAKE2B 77bfae47292edd08cec0504d4006f44f349ba6fef2d670833d5f2c339bbe75f5d5e5afe924793d2f4ae9afb57f018d1e32a11b2cdecfe5c451f5aaa94897dbcf SHA512 906df4039bbd6e054cbcc18b300ea293814b7365c6267348a88abc9902cd30d60bd314b42331a1341befe787f566bca311ca7fb398594ae56cbc2e764d5a8ba2
-EBUILD persistent-test-2.13.1.3.ebuild 1301 BLAKE2B 5a1920bb1d7e56bf3bc7e03fcb3bdf0eea213e6be942b18f8f63a81f43e90f52d68c93c8505463b28f5a65d5e108a711ccd18f2209372b81bfc936b74b51c4db SHA512 182be7b720ee3fc76ac506b6301b471e21143b1d5b96c7b1d09ea8a50dad56af62ddf259e610af1051d9b4bbf367cbe92f3c9d8305754fa8c9de22bb8aca69d9
+EBUILD persistent-test-2.13.1.3.ebuild 1300 BLAKE2B 15f59efa76c92878bf9184a698e1db55be0a5551b11ca3a6fadac907d8c17e8174b76e9faf6062a50eb94dd3fe5243b76ec62a7aa2613f5e9ddf587020ceb404 SHA512 6866f841644eb2e35cca0a2274eadc612ec2957f8a4eaff33c91dccc18317cec9019da295b75e22276132fc914f81a710a7d0519c1223b4f4e13599a4142816b
 MISC metadata.xml 468 BLAKE2B e29b0252566a2d9f69a25176760331dba848c675da846b9edea632b5f25763fafa76b879fd2eb5f8b07c11789670296a6c4cb0ee089091cd3fe5bd192f0e5ffb SHA512 f6a98cd3fc90ef4683a73932607143ce0e303031b2d29a3527b720ecf5f9610cdaf2a77302903efa5ec69a1fa3691f978fe007c3797540efe4c660a6d3466cbc
diff --git a/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild b/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild
index 06b359a7220d..8bac9b253e70 100644
--- 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?]
diff --git a/dev-haskell/quickcheck-classes-base/Manifest b/dev-haskell/quickcheck-classes-base/Manifest
index bd731c8c0add..8e6d095e7597 100644
--- a/dev-haskell/quickcheck-classes-base/Manifest
+++ b/dev-haskell/quickcheck-classes-base/Manifest
@@ -1,4 +1,4 @@
 AUX quickcheck-classes-base-0.6.2.0-laws.patch 1639 BLAKE2B d07511518debc5aa09d712c460fd3414665ad0203fff44f42ea49b17db83c44b0095ac17716df76235d01744d75d65a7255ab33a4e3c98dc0444adc90c6f0a94 SHA512 03b78a341a3d81d096e65d8b038edf6e41b5525b8d6c1c2e44647a73c8980cdd199256ab3a717bf5dde43fe575da4211dff76853fd5cd4b353401ba6bdda1cd1
 DIST quickcheck-classes-base-0.6.2.0.tar.gz 26732 BLAKE2B aa3b7be411c66b72eb07c81e9fe2c1accdde254ae8e510080d7b0ea93df0148317a61633f96fe459ab329af112eee3d8243fb728f5416d95d258b90a40d1d9cf SHA512 730255f74582081e65fa8c6b36ab8a2c26991a8e7d8140361151614e7a9619f178e50820cdfc3bf5771f1688dce369f9d71de683bc89481a20f8d2382ae4b58d
-EBUILD quickcheck-classes-base-0.6.2.0.ebuild 1019 BLAKE2B 3ef990a8571a321c3d7c0f846b08d06ec895599cb589c4420882e104434a76e6494523e023d6c180a7c70dd3d7a498832fc23f034fdd93dea9d45da451dfd12f SHA512 672bbe986c6dc25b71848c3d05d40ad169a6f87a3dfe65b88abc30eda0c5ed69d8519b6befd07fadea2939013a9004ca72d422a337b0987ec18389b2ec2dba09
+EBUILD quickcheck-classes-base-0.6.2.0.ebuild 1016 BLAKE2B 3767ab0488ef34effdc862be079505fc5388e1bde2e616e373996c324a922ca9503eaeb932089aa756c25e2bf25e67a42db561d0acf474cb5abc60f81350171e SHA512 2159c06656dd3e3a4d1136ae0e6d0591183a6f894ac0522a6afa07889f25e9f15d2766c183c96cb3731c8c5cebbd27666c1793c127f227da9c82c0622b6554b0
 MISC metadata.xml 573 BLAKE2B 3e353c8766ddbd8950aaf92b7368371a918f020d9391dedce627814315c2fb7b8f994a0f4401f8eb58ca6a908f67c98c78d83a42a306d15cfc42fa9e7be9de7f SHA512 ce91640de7d3e0f510964db742b9b8a61bbb4b17d78dcee505bab6a4c1041690dc8da0eed1a580b37c57594416b962ab90056078fbd359aa37b9296eb21e5ed9
diff --git 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
index 3563d04b0caa..ec6966e5a141 100644
--- 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
diff --git a/dev-haskell/quickcheck-classes/Manifest b/dev-haskell/quickcheck-classes/Manifest
index 99ccdb9d1802..ac57970326db 100644
--- a/dev-haskell/quickcheck-classes/Manifest
+++ b/dev-haskell/quickcheck-classes/Manifest
@@ -1,5 +1,5 @@
 DIST quickcheck-classes-0.6.4.0.tar.gz 19976 BLAKE2B 614ebc6e1be382a942a55a039921021fd4bcaa2f5c977a8d83bd7b1fb76feebb31f94da908c2389d5f9ab5f7e2481f76223375db41d12b3583658d5d7361ed9b SHA512 2d5786d3cd386a795d5e1ca58ef55fb2efb9285724cf8cbb2f28577973ac2b2a9058ba6185904bc29da88f6d080f4a38629df272502796a0c2e31f9a0e8b658c
 DIST quickcheck-classes-0.6.5.0.tar.gz 20242 BLAKE2B 6b058b9991ad60bc7f9409d9b85d6f02236174eb39765cad3ced0b633ba1877a2866cccd36968e6902e8bae2b2382c319075ce71922afbc1a9e01a6563378b28 SHA512 d0f894d0357522f59440bd795746b3c17802332e3833982cf1d2d20c2a5dc3e4ac1e54f6b3aeac93c0a1beed9f0f4838e20d8798d99bf161b49fc50bdf1f0670
-EBUILD quickcheck-classes-0.6.4.0.ebuild 1975 BLAKE2B d1c3dbabd4959ac36f92721255f24343c53aa7200d0d64a3f326fd58be192b690537d27bab61a954d782746e0e1ebe2ea443f71efa30668d8fd3cd6b8fe1bbfe SHA512 2249e1994e9c0c73b4b7a9b5e3d9877ffdbd953cf33973b7ced69b9d112ff272acb4b61229fc8866e3066ee46bc83c774c53a6acf6456b9a5ed2df2dc5665bff
-EBUILD quickcheck-classes-0.6.5.0.ebuild 1724 BLAKE2B 962695ee8f9343ddc6cca4c61400edf22a92e5931cd52a57a3fe459da4dfd72e5fdc7fc6d10a2c1f62a4c8b0e71873f51787ab013df3a3dec9851f24d934d98c SHA512 57398b5dd643373186587721d261b74bca25dfa81d618b7035091c924cfdb0637ccc7fcbb8674a6a0174f8544fa2ea26c224ccd8fabdeeeeca2535d464705034
+EBUILD quickcheck-classes-0.6.4.0.ebuild 1972 BLAKE2B 91808236d2c6e40654efbdba04078e1648a09da71a7cdc1fa098b25462afdfef169e248c95a092edcbd2831c9a08537c558c7ac34d90c68dec2bfea73a557eec SHA512 78480306328a46da5e30b652f5d454df92ee1e517fa0968f5db5d26c4d910b2116d8936d2dccd283e61cd1f27d652bd2bcff2c9a17d05e06d9577cbb9f7ebfd2
+EBUILD quickcheck-classes-0.6.5.0.ebuild 1721 BLAKE2B 3893c2c7262fbac0604114516204c1bf7b934dc8aa11272911c10fd8e0ed480f2a0cd45ee382791e72c651c8fabede071cbeb33314e9c2297a8f17f3558b7aa0 SHA512 1f7937866145a407ff9a2c9b4a5a32cae60b1823260a61d5f5c8ade1816e6260dded2bf95f7d8eb02613b24900b8b68bd6c72c6ce93295314aba0285bc0a8c44
 MISC metadata.xml 1532 BLAKE2B fc8c855d818d2365d1c93334755e36da6b6f3c40f01e86842f6d365da25acba08437a1428bd8506e4adc327dfc65d10dc6163bab6f3d63f28babb1a4f7777ae7 SHA512 3c801ff4cd520618bb3f8c96ac6a73bad8ff148acc9075c7a635ce34d00b35f0b22c1e2588da1014e2d4a5fa5a100037fda3de708b6b0c6faf8d08cc42629f1b
diff --git a/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild b/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild
index 1a22e5080c84..1ff3c61eeb83 100644
--- 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}
diff --git a/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.5.0.ebuild b/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.5.0.ebuild
index 295570109654..451810b4b4c0 100644
--- 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}
diff --git a/dev-haskell/quickcheck-instances/Manifest b/dev-haskell/quickcheck-instances/Manifest
index 18e28039f7db..2af327b7653a 100644
--- a/dev-haskell/quickcheck-instances/Manifest
+++ b/dev-haskell/quickcheck-instances/Manifest
@@ -2,6 +2,6 @@ DIST quickcheck-instances-0.3.27.cabal 4710 BLAKE2B 591e79f2435e7ae7d7f179b8b7f4
 DIST quickcheck-instances-0.3.27.tar.gz 12711 BLAKE2B f3424d88d4a41924a156bf00490f34b2094bde7d0bfadf375dc0316b89a4774d84fe45a7a964f64f5953deb10a6132e2cd745f67bfb6b10f991a5490d23bc433 SHA512 be2b7525a1433b3cd038b5bcc55c01cc1a9ab2fa02fb89b4cf0d3c4748b6ee4a384b0ff101727a30c6f788a2da72adf87a8c97a36a57ce626f9269e1464f3a90
 DIST quickcheck-instances-0.3.29.1-rev2.cabal 4908 BLAKE2B d261d3a71e6231db20192d9435c2e06843a94195ff745aa7ac75ee243d1dd8bfc31f8e9eb331e942181c6921973bddf88d60d38b2cb1e709a6291a767dd295da SHA512 219ee8c9dbaf39fab98bf04bea787d8f0a6177f78092489b3fe61aa6eaf3c41894ae8c2d9c1cdaa4e8d2bc9c5e6212791131200122b38b5d82bedbb55fe3d2c4
 DIST quickcheck-instances-0.3.29.1.tar.gz 13288 BLAKE2B 7189752a460bf81a00998012c2a45e6653e9d279fd1b272173702fda3f37ac8b7942d01253e2a52a302b93df5871b11e0e921a61dbfb3ef506d4acaa3a61dc5c SHA512 67d9c83cdc40825221bcd88d41911d2c91ab5f8515b2ac1c3c1d3baf1580fbd5793e9069d0d7c630e9a60c1c150d90e4b8cd51c0d76e8a89375c19bcdae8cf7c
-EBUILD quickcheck-instances-0.3.27.ebuild 2493 BLAKE2B 36497dde4ae3bc7c7515b27c9f09e0ab5ada8a5222e0d0844dcddecbdb54e9e956f29c9d304a8bc52671ba23ed68cd83d55094168b50f2f7b3a55fa56f343787 SHA512 d629eb4cc5f2611aad016e78e869ffed7b2046184d7dc4bdaadf41b6ef713c9f74f5b9795f2ed731accfa8e22cd76a101583af71f15478ec3b22f9d277a390c0
-EBUILD quickcheck-instances-0.3.29.1-r1.ebuild 2323 BLAKE2B 79ef35f6164528268886efae7c805eda37a11075c1770887725256022b3eda7b1ad657ba6c3f2975fdafc84a3938548cb8846228474a798f1d46d8368bbc2be9 SHA512 b0ccaaeecda2614e3c531b881e957952d68f13b5340cd9f7c30a585b5da98339cafd285ba3b550a10e4f8b6fc4d42b3f073d4fc5d171d41842cdb09e8e7eaea7
+EBUILD quickcheck-instances-0.3.27.ebuild 2491 BLAKE2B f394126095faf707e5ac3345fe029dcc5cc079944c58704eb86a5be2738eef5098ba1e90dcdf6e69d2e31494050ddd70bcf330a36a759d999ad75483074e3124 SHA512 6984133ee676a977b23f564893e03583a7669e7a4746a99c38488357af127fa0d8641211eaff90725cba48602ce91d54cf5712704cc82670675d18938a0d2c17
+EBUILD quickcheck-instances-0.3.29.1-r1.ebuild 2321 BLAKE2B 0661dd6f1d52da1c5d754e1b44505f560086b45e664771a5bab465446810d46db8a37f8b43810773af22d508adf23703b8fcf58de851e649a851f5bb0e273be2 SHA512 ed66fcf67906d5a9e747ab5a45597b50ff392e7a89470d7a0edb1b184cf739946ef6c06f657145d09ec30e2d1826b3505779d835eae68aa4d910739ca9a0fcdb
 MISC metadata.xml 399 BLAKE2B 1c9e883f868a86aebbd8e8f3988c113980a6ca922588ecd0b2bc38e56dec64a57d33fed7424fb7e985f916ae3a17b3454d5411d951b838a71dc6ad888616a386 SHA512 bf53210d0532e79dada19e3d5f6c9e9aedb1f595d68a83314e913c023c7ad91bd9cbd5187a36c12558d9251a9b76d22b7e4e921560a7eb8a815e20a62f60bafd
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild
index a618cad264ed..9356b57ae4e2 100644
--- 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?]
diff --git 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
index 89efd46e848b..3460fbf27534 100644
--- 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?]
diff --git a/dev-haskell/quickcheck-io/Manifest b/dev-haskell/quickcheck-io/Manifest
index 1db24f83b954..7d33a2752c44 100644
--- a/dev-haskell/quickcheck-io/Manifest
+++ b/dev-haskell/quickcheck-io/Manifest
@@ -1,3 +1,3 @@
 DIST quickcheck-io-0.2.0.tar.gz 1843 BLAKE2B ee6179ed912313a17d0506c35ae79853aba4e31fab90c1f6727b59879bf3b172f739eb6be5186af1aea47342aa8a357bb4565299a820beaf104e642338db01e9 SHA512 02e1f40bac8f31f27c21d1d2df9f226816f9da871092b09f0451a8321e250c9e94887f94889be421c9d0034e0a27b02c907d16eb7da5a4376df42c7c1fbd01df
-EBUILD quickcheck-io-0.2.0.ebuild 657 BLAKE2B ad25cf5f473bc10a202d3b4cb96360d5565d6bca6e410cd183af65e73be44b455e2c60c2a759f8c8ed4bc85fbdcb09bd4e1a9689f56fdc27bb07b1069f0e1e60 SHA512 08daade9a3e26272b09a6395c51ab9da9443631a154237c8dfaa859779825c1f71d763a0dc706a7d54cbf3f5f12b8158a15616742f018afc92eeba92c4f22534
+EBUILD quickcheck-io-0.2.0.ebuild 656 BLAKE2B 9e51151f4f1c51c105816de3622405cc3b18ffccba3992a3d66b5400db4070789cdfd0b83d18820a08cc59b6e2e9ac90c0368a069e07454a4e8ea5fa2489fbcc SHA512 8cfc97b0363b10b4fe4fbeed9c38bfe66411b3eb100287c4fd4a95d568450cda6f7f4224c06483368141edae604cf40759672db6d5d5bc46c4bfa838f4e05d75
 MISC metadata.xml 484 BLAKE2B 98716d36f9df2f8e480547ef588ab7aaa060a677471cb6872162bcd41a2cfa9f9efbf1ab3440ca9ca80433d07018631caa6370ad9253794576931f7adf000207 SHA512 96141dc7462313578f27187c3aa1ff9c16272dce58f848b1b1043df215d975904176818d95c1321c7872f8ce9a70b9c926758f4099c17df55d0e7734e07c1d5e
diff --git a/dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild b/dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild
index fff29d9e2290..d0d77abef81c 100644
--- 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}
diff --git a/dev-haskell/quickcheck-unicode/Manifest b/dev-haskell/quickcheck-unicode/Manifest
index 213dbac12885..117f4637c3f3 100644
--- a/dev-haskell/quickcheck-unicode/Manifest
+++ b/dev-haskell/quickcheck-unicode/Manifest
@@ -1,3 +1,3 @@
 DIST quickcheck-unicode-1.0.1.0.tar.gz 3216 BLAKE2B 29a0736759a4b17b7623a14ffc13048fd7d516275918ce61d6fa5c546999b24f2a763bd4b91993f3609c32a16558f38c24c019ff13a8120982e1c02e42bee83a SHA512 4762d9cdf7624e28586ed18ad05f273b600bf664cb3f3f76d9e33dd217181f49f5835ac6276da8d5302dbf89fe65cec4e9d3c1e57dfc457ee3b3748467672c15
-EBUILD quickcheck-unicode-1.0.1.0.ebuild 574 BLAKE2B 71485892a289f7cea9f15bbb9017e149568d3266529d22ba61bc4aa3a8d904c16edb1a3f65b150c9a8bf12c2fbd2c773f4a522400893b2101eab338c09616a82 SHA512 1dab7cbb641456b71750ef7993a9322e588d640ff7c8133bbd96a1bfcd372e0aab4aa76f740ad4216b996276ab74334e2fcf811d8bffccc8dda2a13c125c03fa
+EBUILD quickcheck-unicode-1.0.1.0.ebuild 573 BLAKE2B a216197e16e28b470e9072f01d4bc25d635be34911c9f4ea15fe363f460c606a5c901d89f9735b8580521b23beb20520041a0d6d440debd0721a81a9541cb43d SHA512 88d2edfc05b3b6d755e28110c7471dc4e65350d7c245e321ced32d8cc780e4ee797e75bde1a2f85561c86f457a8681ffce1d028a3391ebdfd6714d91a6d07eea
 MISC metadata.xml 396 BLAKE2B 8caac8fdea06299c1709dd82371ced9d44304ad31b3e58f7c447864498eb41f2206313c745f27bf7f14b288a4ef8afd45ac790047e125ac80aa73719de10944d SHA512 d59ad68895469054fd4a071b06c1fc1b6c3adedb140798378005ffe840c28ee206b27848264ef9d7f341ec4a546904555542b66709ee26149cce62d122f8edc1
diff --git a/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.1.0.ebuild b/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.1.0.ebuild
index ce958f28633a..ffae93f746d1 100644
--- 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}
diff --git a/dev-haskell/quickcheck/Manifest b/dev-haskell/quickcheck/Manifest
index a779c485caed..6a9ec2e9eed0 100644
--- a/dev-haskell/quickcheck/Manifest
+++ b/dev-haskell/quickcheck/Manifest
@@ -1,5 +1,5 @@
 DIST QuickCheck-2.14.2.tar.gz 75246 BLAKE2B a64ad51f3daa858a224c00fb785979460b638d76f20c7a19d95a6303cd5da61adaa40cb52e154dd15218adbf54fff184f16ab3b932895294cf37f24982a2b9cc SHA512 84decd354e6093bc72afd125410499dd4be3ae8fdbf0a3b466011b4dbcb5c5657e51ab75cfe22790e22bf4ac54cbb1203ff7a0d108e872ce60f4831be827a6e5
 DIST quickcheck-2.14.3.tar.gz 76849 BLAKE2B e3a0eefaebd27fe5e11c4ed8dd7120b42e688be1cd249ee88a8b6b25a248376fae6d3f2f0506f675040314e019baeb60eac993421a0a7d87f821cdab01e93be5 SHA512 d00499fcdbe66d384a40c66a0d01dfe80f0622599f2f19ab569b45ef13c8d726c855b4687c7a1be022ea22df4bc66c48cf12fc156fadc558714fccc5a3deef7e
-EBUILD quickcheck-2.14.2.ebuild 1078 BLAKE2B b61014376fee9c8a7443cd61560d555890e38a22a3d2e67fab25a894e5b466f9794c6777478b5deb2740ad63fb363cb22988e283977f5eb23cc23d87a63dcd67 SHA512 b395fd991394300ff8fdde0a1435aece7cad72e323b59167187a861b7860177eec1a2ee3941b0e20f4c1ee43f275e794bc915962c3bef824e3aca21f719a3302
-EBUILD quickcheck-2.14.3.ebuild 957 BLAKE2B 2db88636744ec10ec3d61072e394f5a05620ed90ea8f4d520b1b1e59c25530b636f5476c73e6161b6f9d8e4d79c8e4eeb4b57c703218a3d4ad1b87f4f04170ab SHA512 f49cc73ca4528562c44b9aa3fc551d075ff04c1c03a6edc406f122bcbaa57180a88d3121b85033700a24c9ed7706d3070ac7a455240274c313754a818316d7ba
+EBUILD quickcheck-2.14.2.ebuild 1078 BLAKE2B 9dc46860e3545fc03e9d1a48240da1ac242c972ba3461c4bf58006d00f7e11438d645e69504ccaa43f528d420085b5fec4a692715cb9eb3df64d50053dcc7963 SHA512 47c6ef01205290b21a4feb0beb867dd6f31c6dda2dd906872a5356e830f8a06a4e7922a4f79a97326a22d01e62a3e6b2fc15248f9deea959bb49fa091f5b5f29
+EBUILD quickcheck-2.14.3.ebuild 957 BLAKE2B 376e9adb53e108932a7757980ba34daf98273c8c0cab7555e06136e56079778abb06d86ef34202cf343f3c25c2d49f767eabd87d6c20fd6ef9d2c2549e3666f3 SHA512 5b5f85c49422650854c211f6b5230bfc69bfe5696f433989a25350beb4fc2025d1a2058ac6cb7a22cd4d7af9c88b01fe1204e244e54d7843f4a72effc92c496a
 MISC metadata.xml 495 BLAKE2B 4f4d584c118963c4f596e12adcfee09e86f3da6451fc57033362cb3e2d4c4da6241c5a88037659b2b8042050214d49aca44ded51544acbe6b797ec90c70e05ed SHA512 b12783f252c56cc91ac8edf34e0b576b356407a7aa122927eb3310fa32a133c1a1dbf2fa37d3fe0c6e10658fb5f3560cbe1148c26f92d5bfb04b2332eb749ae8
diff --git a/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild
index 29e667b80fcd..ab6efc03e6ab 100644
--- 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"
 
diff --git a/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild b/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild
index bcfff140bd41..6af1c5d02f8f 100644
--- 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"
 
diff --git a/dev-haskell/reducers/Manifest b/dev-haskell/reducers/Manifest
index ef8f21e2ee35..79381794fca9 100644
--- a/dev-haskell/reducers/Manifest
+++ b/dev-haskell/reducers/Manifest
@@ -1,6 +1,6 @@
 DIST reducers-3.12.3.tar.gz 13405 BLAKE2B 8631ac257a24958be7446ff7bdb2e02ccad4e591d4f8334baf322fc58cdbadfc7c0eaa73f6a371ebf24b263057263b3230e3ff0e1b5aced348cebe979199e7aa SHA512 7bb78ccf107d7bc6bce8d68c3766b799ce2c2a41587ee4d2b7197c2dae1d27a6ce47110f1abd655108d7fcc306e9069a25562e53b00ff97704af0b8aac9139d9
 DIST reducers-3.12.4-rev2.cabal 2587 BLAKE2B bdb182b2ede577aa99b3a8146194a1fb7f20e06f402225092e6cc72bbb453443c09b23cc9a10fecd4c5748606b8268f34c89f35e9465e2aab2dc5eb1f00198d5 SHA512 7255995503c9d47ae035a773d3c61900203564b36dec91f6cf4390252b58c8e69d9b7fcd39fe5a7a77d33f28468621f2697c65a198e10b063ee9569b89c2eb51
 DIST reducers-3.12.4.tar.gz 11938 BLAKE2B d98fc9bcb4735f0dfa21230f34bba3c0d2624c1bc8d8caa11eb87a1a566d44c3ac6e36f78dd38d2a7e462dd96df32c6e483f3e8ff76d7acf867add0154c8c88a SHA512 5640cb567b21e06884d0f8cbdc90530f90ef2bebf783e3d02e0fd5fd7ed2fd24876d612a6e5ece14ccfe80e963f19a2925b2af4c5317c44de75b1b1894457f1f
-EBUILD reducers-3.12.3-r1.ebuild 1147 BLAKE2B 4a129d9716889a93bf683890a8f30dc88c81a9c0b13db9ca9653600c68e5559b4e667d282315cb523aa563beb6dc0f081aa5260b60509f6f84590455b1cd9df9 SHA512 371e7952a13763a0ecfb448531674bae9d70323a23ad01eb7972d6fc8cfca5f734e853e31bbca20ef2b07c68a269a662bee1cff9c5cd93cb3be3ed321a41b0b0
+EBUILD reducers-3.12.3-r1.ebuild 1165 BLAKE2B 6e964b100c02ae546f301abd88eda6633b4bb450c6d319c40402ef732695054ba25c1bfd9d07598a92a958abd84952ef255b466d445ab08deed10de2d9281c1b SHA512 9de83b6623d1fe4997519f3528fedbb689f45e76b439c93f519be03b02288762f4771f9f99a6a3bc9b6d678105a72dd20bc3bf5b6dd0962c2e23b74791d97839
 EBUILD reducers-3.12.4.ebuild 977 BLAKE2B b3f2021f20a49a889f4e73bcf1aa98f0f9652b765764aaaa9083d9650421d85581a74aca4667597f6d8a160ded4275a5dfbb25e4fc48fcc7919ea2e9727431ae SHA512 a9b337f8f42e745542840004884b2400aba8bad1c940623a89a5c663e1977644bc5dbab94bdb4ae8cfdce9b1de3feadf6ec20a721d82399ae29e775eaa94b114
 MISC metadata.xml 379 BLAKE2B ae41ec2bbe5ef5370b6b46b2386329a7224e8c2632775fc6bb8fe4376af7a3b2680f52bf2b77ef287316743f7eb9d68c39ba059444644587de4a9c47b9c549cb SHA512 490b3e852c005699c5741899dfd8bc106c1978068099b8451a477ff9a00a84c26cc5436e1a0fac21de8e127465cce4918a387b95a9cc8aa79afa21f8b0322b6b
diff --git a/dev-haskell/reducers/reducers-3.12.3-r1.ebuild b/dev-haskell/reducers/reducers-3.12.3-r1.ebuild
index 20cfff69798f..ff4a631e7b31 100644
--- 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
diff --git a/dev-haskell/regex-base/Manifest b/dev-haskell/regex-base/Manifest
index 20d5d8d7294d..d52fee17200d 100644
--- a/dev-haskell/regex-base/Manifest
+++ b/dev-haskell/regex-base/Manifest
@@ -1,6 +1,7 @@
+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
-EBUILD regex-base-0.94.0.1.ebuild 745 BLAKE2B b2b54a7660399bcd52ac30aa94c6dae2fcdf778f18b03c2fa96fd36b3e5a924108fb1db4baaad7941dc8732c14f0e1667adc9a619e59c3c57748525031d91f20 SHA512 5c9921e0a2a9d283166a3bd8ad477d7d1797ad024d6b52d5eeca6d3c31dcac0c81a246c96ff4292d1a355854539c71a836064e4f10025a38744bc93d60cc567c
+EBUILD regex-base-0.94.0.1.ebuild 710 BLAKE2B fb405038196b9bb0c69534eb73c189d94d38c60f53029d2e90c53f8267eee3e64c6224b2c4e84813dc8b7f57532b969aa85fe2bbbf291434695fd21c189a06f2 SHA512 e8cba0101fe5686ebce6986698b205b3975bc30e25a7b473b51847b5892ed8fbc1cf3b0bc2361050f42b06c6cce65e0a1d58d88c8a5c6ebf234159e3ae371ac5
 EBUILD regex-base-0.94.0.2.ebuild 560 BLAKE2B af9cf9886133ee0b3170f689a25926fe7430e6e6834cccf007f7390a62ae8625c5dfd270d5c43be3d84b85fbe3989bdef4eb875fad15dceb4105c3b16852408d SHA512 3bea8f80413b982677eb7b5e96c68f7035ed04db482fc3167bca98da8d7a355c7bcf06f928e27275c22595567330987c8d36bc37079644329eb76deaa5dddd3f
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 380 BLAKE2B 1c3c3862864fe8583c3b599bf18cfff99e3b72f6d4978242541bdae4ff8a02076ad6d1471c23baf28b67817c06c77c5605e4efe9ded2820e2b8610e05f512310 SHA512 018b28b01e66867b461a3512804b9691e14b51ac4d7767d4169ae366e51632bed4c63d64d4065e48d78a9a53f32433ab4079b65385b5bb9570321ddedd632631
diff --git a/dev-haskell/regex-base/metadata.xml b/dev-haskell/regex-base/metadata.xml
index 937381521944..21701273e298 100644
--- 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>
diff --git a/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild b/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild
index e766df4d1743..cdb10b0b9edd 100644
--- 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}"
diff --git a/dev-haskell/regex-posix/Manifest b/dev-haskell/regex-posix/Manifest
index abc62a1134e3..7f72d00fde48 100644
--- a/dev-haskell/regex-posix/Manifest
+++ b/dev-haskell/regex-posix/Manifest
@@ -1,6 +1,7 @@
+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
-EBUILD regex-posix-0.96.0.0.ebuild 996 BLAKE2B ef102dec02479fd146e17fc69ec311a26fea1b142e1c54fc5985de0c9da1881b9f42b24fd6fda62b98942ad8622bfa3911b0191918ed3c859d9b13735d6627f4 SHA512 bb628b9b5402a984f983a62c00d7016b5fd73d1973924abc8e1667d29add3c784e69218d6d6a9f21d4e1895277b9db3b8f62b985df8c622f0ece015f23e90457
+EBUILD regex-posix-0.96.0.0.ebuild 947 BLAKE2B a5edb8685bd73079363e74edbf0d2b2fc921df1a6238f7987bd8c0390314768da88497da387933c7fd5b33717d29879ad2df4a159547d156cc895c1f2bfe7a87 SHA512 9c7689da1eb31b170b4c7672d3042e33ab2a7900d0c7d48f733906ea39d8c5adc87d458ff2ff06cc1c6063bccd2b55d6f0fc15b1eb16b5f37ae11e0ab53118d8
 EBUILD regex-posix-0.96.0.1.ebuild 823 BLAKE2B 704331444f8644bc5f1d121bacd844679286df135ed7753571e0fa27d87458ccf331084e41e84fb899bfffbeb464a5abb3ce635a6b682b5b179ebf37ffafe1ae SHA512 a5e444870b3c4541f4a1cec1504f49bece3e209666d5c11247baf082852fe35e08a2879c8543839ed0365d29f8c96ba3de55329a2cae435c02d741c4c236ace4
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+MISC metadata.xml 436 BLAKE2B 88eb547e3e46efe5c3ecc080d6007eb15c075b8293b4d99d659f26f83e10f0b57b7f74e1f3ac61aa3220549fb0cf500fb5008c6a5868e2fff036a4daf6030a1f SHA512 cfbd6d243883d112eb1e6ce8cf8afdf6c1190b580197d6f075766e24e733635b1b16a40bc738ab9fcc9c54144b1b00ca3b2fea861ecccd8237efcfdc8c59ba0f
diff --git a/dev-haskell/regex-posix/metadata.xml b/dev-haskell/regex-posix/metadata.xml
index 937381521944..1287ec351796 100644
--- 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>
diff --git a/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild b/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild
index 902b314f2c34..1027d4a26bca 100644
--- 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() {
diff --git a/dev-haskell/servant/Manifest b/dev-haskell/servant/Manifest
index 5ad516782dc4..b46bddeb079c 100644
--- a/dev-haskell/servant/Manifest
+++ b/dev-haskell/servant/Manifest
@@ -2,6 +2,6 @@ DIST servant-0.19-rev4.cabal 5562 BLAKE2B 317773458ecb9ffae30c5f16a478d3587db7e5
 DIST servant-0.19.tar.gz 54480 BLAKE2B 0066fc21e6bcc1f572b20048e6fee85e093b15a292d4916fc0de39462f4ac5292aab1007eecdfd553ea37bcb4ce93f24f8180d9efe0c1a0be8a729971e36db6c SHA512 5f7a7a03e7cb1f729cf4265a767006b4d65dfadea878540df3ffb8347e1d2ff5d8faaa58a5e032535a489fd45e1da81dc9424c2d931b6d26adf156ee59f1c003
 DIST servant-0.20-rev1.cabal 5622 BLAKE2B 112493e257801317eee5f1341b2cc4d27262f5bb1ad48cad4bb983ccb47ad610fc3233af9deb8a944080ab47c2f9604ad3502e9c88dcf2ab81efb95116fa0a2d SHA512 f15582d6badf85eca1b0914d0ae0eb1b9a6e18bb4a5c2aa8c116e44b9aaf0c239fb30e7beef3c7616d4283e657c898ac01f6f0b34a14aa59f2f8d6caa393f628
 DIST servant-0.20.tar.gz 56212 BLAKE2B d2c9c2fe9b9dd0e6c6d5b4f1ef4ad5b14b101723052a6a7b3f9fd3517a902f04b05686ed9851567a108ecd6e175fde703902b226bcddeed9eeb71e55d1b2857c SHA512 fd87b30fa3f212104d354fdd52eb5813c2bf79dc2d36917312604c56c4e8d4bc48e373cc2ad6d648225300ecd130dbc50caacfefb567226312f01dcbce4456b0
-EBUILD servant-0.19.ebuild 2627 BLAKE2B 03527d166cf80db1aab0fa381b01444b547f343aace397cd29c0ae887b7db36853a681fee813100018e0b4b81ce148eed5c08fb5875925b8020f74da2c9afd63 SHA512 3edff550fcf6050fb6248d3673bd1f48f1bbdf2ebf9756f5496aacb221ed75e3c3ccc9131fe3547794967f3adc03e8defd3677bf06c32c3b76107929d71523c7
-EBUILD servant-0.20.ebuild 2172 BLAKE2B 1fe8ad8cda2504b2da875c2e5ce5ec70cf2bd7f9f6bd39b65c422ef77c2f4aff3b97fcaefb41f8ea683f0027c9cb899e0b418a5ffe3b5c56a2db8afc99226b39 SHA512 9e0c6eeed294e2a3690b067905a27588711b17102e4688946d5b217026650fe8430f780bafc568f2a2c944198ba5df0f103a9630b790897c985f41ea335bef65
+EBUILD servant-0.19.ebuild 2625 BLAKE2B f12470b88ea348416fed14239ee3e0a3c33d9faffd1f7a3e6c32356bf8bb7fc29bb6e578efb7b78939d199cec3ef0cda962cd13ea9ca55625145b63b56550e3b SHA512 b3c7d4be9f6a2a3469286d84644f0f2f8416f05973357977b9d6b58d1d00e6fe5113f25abeb574dfb67a9e4e8977254520195cd49f26627c9fcc28a10d839a32
+EBUILD servant-0.20.ebuild 2170 BLAKE2B 4667881d7078d1e0928f379c9ac7773b9e015e9f2c4bdf64d923766f92fda25dedd20a5d135654cae5cf7a72a1937648eeec7cdf0f44eccf29363bb5beb5d45d SHA512 8f9b87aa6d129fc5b23eaf8c39ed03f72282af9e9227664d64ec5f4cb2a2670b1ff02e143eb434ef4820eb9ecf3df08115c9a10c1f3b77d37fec77e0a5789866
 MISC metadata.xml 386 BLAKE2B 81a870e812442b2522d9bf2d3113a0dc406acc74e1fc3e4afa1b724bc4afe2b28b6281a43e579441102ec9177fb92aefe687c95a87718da2d694a71cc332abb7 SHA512 60f2ff8eaedb5ce79115fe781f3311e05904774496dbc097e870e1ecaf65c52ff7aa11b5a78864cad770c914f09da51d713477aa3f0ce331e449fabd9c35fa62
diff --git a/dev-haskell/servant/servant-0.19.ebuild b/dev-haskell/servant/servant-0.19.ebuild
index d15e317c0b0f..000cd5defb16 100644
--- 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?]
diff --git a/dev-haskell/servant/servant-0.20.ebuild b/dev-haskell/servant/servant-0.20.ebuild
index 6203cb5108cf..e6badfc221b5 100644
--- 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?]
diff --git a/dev-haskell/shelly/Manifest b/dev-haskell/shelly/Manifest
index 6ac42cb18365..828280998f7b 100644
--- a/dev-haskell/shelly/Manifest
+++ b/dev-haskell/shelly/Manifest
@@ -1,5 +1,6 @@
 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
 EBUILD shelly-1.12.1.ebuild 1807 BLAKE2B 8ee1f8681f770794ee09779880b6680f95eb734f4ad729d510a8c9f05a5ab0a7e7dee6e89f98f78953b25cb155d454f258233de4683bfc6d057a78f50d1d78ac SHA512 09f7af05b229d3e2ae90dda3afc85e93bdccf5813ebc458217714e3bd03995c2e84f0517f45a0a2966441616f51a5267c4bf0e3cd34a2c3c329bae166d41b8c4
-EBUILD shelly-1.9.0.ebuild 1307 BLAKE2B 601dc73b93c12547a2821aec4fdfcfd8db62a8d4234da4cc535b3bfeb442e80c8cc78f672703a2e966aa99d5a5020aad54eabbcb9b8b81694bfd0a1a151b62c1 SHA512 8e471a92524d9383bcfa3701e934b36235aa55bc87c978cf8e213a82f00728f6d6874ec9729eb30db1c8c0415cbb96ab95afe984e81a6a8a1dc48fa4c3870e4d
-MISC metadata.xml 460 BLAKE2B ecb76a73f8bfe9d0e779f1073fb6f22a1a6b4d87917fdbcb0afa1b0da2c7695b12dc30ce57ea4fea5249a83ebafa81b738ae35259d3729f5c85ade1a831c8143 SHA512 143dd44d7eaef9e2047f6ab89889392404453b9a0c70e25ce3cdb8aebd8c0c3c243a682b0736ef580b158352a8641511165b752b96f9ac1d1486d07c99579dbb
+EBUILD shelly-1.9.0.ebuild 1753 BLAKE2B 6832c1fe16c839e9b8ce26b556108b67c918aee0cd30f02410cda1a5feb3db343097fe0db7ceb9a4f2da67ea93e75432062f033637f7771c334ac1c12ea5889b SHA512 2522c6e23940badb53602b28678cfc91ebae9d73e5533596fdd8b190ea98744529853b48fbe9ed145b8ace2c032448a090e34db2cd4c81c2dbcb26f6308830ee
+MISC metadata.xml 460 BLAKE2B 2b0e17b2d4e4f069db05672950ce0c2990d2ec261d37245e3d672ae28eb37933d51567d427591dea7ca724ab3d03cafc0d69894e05b68f22573eb8f1c764b6d2 SHA512 c767d2a6244c3ff96a71d65687717ddd677d86b9447aa6e40862b9f83293a8713fe491371cf5a23e86d4068c6f19c7243566c9e85beaa367a83ed069a793ca2d
diff --git a/dev-haskell/shelly/metadata.xml b/dev-haskell/shelly/metadata.xml
index 4894a131f231..785c05c3d993 100644
--- 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>
diff --git a/dev-haskell/shelly/shelly-1.9.0.ebuild b/dev-haskell/shelly/shelly-1.9.0.ebuild
index 03d0f05b45c7..9d511cbf704a 100644
--- a/dev-haskell/shelly/shelly-1.9.0.ebuild
+++ b/dev-haskell/shelly/shelly-1.9.0.ebuild
@@ -3,43 +3,74 @@
 
 EAPI=8
 
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.8.4.0.9999
 #hackport: flags: build-examples:examples
 
+CABAL_HACKAGE_REVISION=3
+
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="shell-like (systems) programming in Haskell"
-HOMEPAGE="https://github.com/gregwebs/Shelly.hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+HOMEPAGE="https://github.com/yesodweb/Shelly.hs"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="examples lifted"
 
+CABAL_CHDEPS=(
+	'time                      >= 1.3 && < 1.10' 'time >=1.3'
+)
+
 RDEPEND="dev-haskell/async:=[profile?]
 	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
 	dev-haskell/lifted-async:=[profile?]
 	dev-haskell/lifted-base:=[profile?]
 	>=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
 	dev-haskell/text:=[profile?]
 	dev-haskell/transformers-base:=[profile?]
 	<dev-haskell/unix-compat-0.6:=[profile?]
-	>=dev-lang/ghc-8.0.2:=
+	>=dev-lang/ghc-9.0.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
+	>=dev-haskell/cabal-3.4.1.0
 	test? ( >=dev-haskell/hspec-2.0
 		dev-haskell/hspec-contrib
 		>=dev-haskell/hunit-1.2
 		>=dev-haskell/text-0.11 )
 "
 
+example_exes=(
+	"drain"
+	"run-handles"
+	"Color"
+)
+
+src_prepare() {
+	for e in "${example_exes[@]}"; do
+		export CABAL_CHDEPS+=(
+			"Executable ${e}"
+			"executable ${PN}-examples-${e}"
+		)
+	done
+
+	haskell-cabal_src_prepare
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag examples build-examples) \
 		$(cabal_flag lifted lifted)
 }
+
+pkg_postinst() {
+	ghc-package_pkg_postinst
+
+	elog "The following example executables installed with this package have been"
+	elog "renamed to help prevent name collisions:"
+
+	for e in "${example_exes[@]}"; do
+		elog "${e} -> ${PN}-examples-${e}"
+	done
+}
diff --git a/dev-haskell/splitmix/Manifest b/dev-haskell/splitmix/Manifest
index 4400905cf24e..b38b97d797a5 100644
--- a/dev-haskell/splitmix/Manifest
+++ b/dev-haskell/splitmix/Manifest
@@ -1,6 +1,6 @@
 DIST splitmix-0.1.0.3.tar.gz 20754 BLAKE2B b9eecbdc2f05361aaa852afd8f6b0c6ca220b2d09e0a0d598796636ace0f995c39defb6d84c6c3ed1bba2e3822ef1bf48f2f34d5ac4406031c4ae5b6cf6d0824 SHA512 22a3f0759e1c1150aabde01a77b48087509dfc7ff9614e97e5e06af73f533170993ff2e18101d940e7ddba81b8d6e496795be3851fccfa07b75e9d922f325064
 DIST splitmix-0.1.0.4-rev2.cabal 6537 BLAKE2B ca7d01b9fd1f16d89699e6cd024096bccd39b0ef370726c37b016ce3c3da7db9231e6cea2313d9fc2e91b046e9dd65d24c85139ce598495d055a2e90d98c6dff SHA512 7c23b28ed7af57c7c08c286da9a8de7cb2d4e24f9bea0b36a5c0235e2f8e2e9a25fd23af1792b726780822ae27cc89c0143158693acc5f916106a6ceb40cd2ed
 DIST splitmix-0.1.0.4.tar.gz 22382 BLAKE2B 1a6636790bae725410cb3b7c75cf0b24f1e0669b399248d9236d7f7d22547229f3cb05d61d1b6f66bb4cb9ca15a1c11f1143797b5de5c88e81315aff9309dc55 SHA512 9a5cbe8100d44fadeb8bf009b03b1770d6b86ef0f71d625e3fb909881d599f4122833647c13a78152369e2744327d5c3f8b552fdc6a47d2705891ca6331c268e
-EBUILD splitmix-0.1.0.3.ebuild 1558 BLAKE2B 289715250ea6837848ba29419cd8602dffdae7020953f0ca5f9ca123c106bdb9bc170c9872138a228943530403b4cd975e0d03e605cdc6f7f91771a4073767c2 SHA512 5bfd53c4cbe68a2ef1cc39f769e22f8653c066ec6c6a2ce2de9813e56b1b2413886fe18108d66acdbec265d4dfbaa7163deec64f419e3847ed68724ffe1bce90
+EBUILD splitmix-0.1.0.3.ebuild 1620 BLAKE2B a296ea84982870a6c7debe9331a49ab15fd43a331feb69e14501433ffc19c8b5ade177029f9f76a9dd7a3f43d03800fad60527eb38b1672775449f2de34c59df SHA512 a16ab1609bc929c70f071d3d0047030d67daeda122da85e3bbb1aa4e70d0878186fedb45d145f7b78e8066a06f10dff655e0bb592366d8c4f85199d68e0341bd
 EBUILD splitmix-0.1.0.4.ebuild 1644 BLAKE2B 5723948eebbe07ac40de6c30d9839aa65e72436b6f8800f153c62a7a4707efd704dd7072996176decd627d6d7df91e107c1f249a92baf6e154e3d86908f5ee40 SHA512 11fc29accd8e7acfe190fffe0d753b800f2170a0e90fcc480e6eebc757d682fd801907dd1ac9de81145685413e806cddba6b89628e58b29ec4f717fd04dc6139
 MISC metadata.xml 461 BLAKE2B f51779ac6b2716ab896b73c1535aed5ee61bc972a23ce38c737950e0b3a77c20ce0b296d60694e769b95e778a58e98a0aea20075bed58ad9ee9a085cb93ff9ec SHA512 87f1046b9630f2476b0809cd42ad6fb432c7a5f507f90bf6cc8f2d2b5f99311d73b63cec73bd2df48ae14df50ce08f65018b607b74188bfbd8b9d71a15849b18
diff --git a/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild b/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild
index f1ab5b1ff80f..dfc77b48ea85 100644
--- a/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild
+++ b/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild
@@ -19,6 +19,10 @@ IUSE="optimised-mixer"
 
 RESTRICT=test # circular deps: dev-haskell/splitmix[test]->dev-haskell/base-compat-batteries->dev-haskell/quickcheck->dev-haskell/splitmix
 
+CABAL_CHDEPS=(
+	'base     >=4.3     && <4.16' 'base >=4.3'
+)
+
 RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-haskell/stm/Manifest b/dev-haskell/stm/Manifest
index 47ee56be0f77..f9421735b5b0 100644
--- a/dev-haskell/stm/Manifest
+++ b/dev-haskell/stm/Manifest
@@ -1,6 +1,6 @@
 DIST stm-2.5.0.1.tar.gz 15393 BLAKE2B 3992741861945f22fcfa21333f24dc187b099963eb9a9776451d24ebe85ca65b2c141da8dbfc784342c0c3c2b4c2ffac7affc847ce14fa73519bbdad5c8924b7 SHA512 631de1102c405af879ecf7b2fe1affbac80158f04e1d16b9e83ebbdccb915e9472ddb654048bad2bfbd9831e7ab76b6e7e295743abe2a32bf1e5459703b8cc0b
 DIST stm-2.5.0.2-rev1.cabal 2314 BLAKE2B 2d8f9ef6a3cd81d3e993cbddfb17bbcd53704697aea82ff91c1dd70984435b5e7f99c1c9118f295b1f3111eacd34d44085fe26396b297c3d38ad9c6a683458b0 SHA512 f0f64d4476c7cfe5c4893f5b396f2f7e4884f2a7bccd6116868af6ee55591c78ea99ffcdb2b7a3c31bd2ab5d36bc59dfe6fc8e35ea053c4952033446dbe07aaf
 DIST stm-2.5.0.2.tar.gz 15638 BLAKE2B 3a4167ae2a879128446e1e070341090dbe57f25956be587be5d56f51940c497cb6f12001dbe3a40b453e3fe4ccb1f520029efb53d04f46ab1eda93aab443c2fd SHA512 7fb91df2ab931437ad05956f7a06f8032c3f930f00325b6ecac4363da9334008424cd63fb14e8bc2cb6cf9ed3c2da240afef8c2d6e7faa1e3d314a3145092c4e
-EBUILD stm-2.5.0.1-r1.ebuild 753 BLAKE2B ca86864761a85cc215dae6eb136ededd18559b9efd5b7d708f24b83ad390395488ab147eed22f905a26fb32291bdcd8cc1c8d67f12522ea69c20d4ca5d4e70c6 SHA512 bbb9b630e523bbfa8e324a7c233c23992ad2eb58b33d03e28e182b623b75e7b20ac7909918e0ed69e17fa1b124a6dafc3a6727255f791bc78b780b128d78dd60
+EBUILD stm-2.5.0.1-r1.ebuild 829 BLAKE2B 7cb9b891413c3003ccde4cacbc723b187300b5ad9bc1115099e1f989194e9fa5a38b10821274293e3b318e6f6d10660212791b53cdda95708cfbb542fb22df39 SHA512 125468db8b5588fb03cf2b2a8145b6464c879ffe473225ce807195533cad04e347f7aee28cbb53dbd0dcda94800071d263954321a0e08c285d77c0227a30b8f3
 EBUILD stm-2.5.0.2-r1.ebuild 655 BLAKE2B 5222c76205a9eb4f3ac9d70e58e956a0cdf112390ed4f144e9c39c8343a716e98f5f67885698201577c435c90f317672f1e5ab77c03cbd21e3d49ae21bd4165e SHA512 992038019339d0f94a3c39353348c101fe568f6b2feb98492a477ff28dcd1fb6034d20eb83147d2d3f6c12f6efd43b441135479ab2c031a2d1257d127dd8b8b5
 MISC metadata.xml 370 BLAKE2B 8a27526cc0b4ba6f30055f403982541f9609b8eec95e4c853f19c007eae3c8f4f9f7e153ee9f5c93304e50dec6385c218215d0ca21ea12850603e65bb5760c4c SHA512 3e0dc8a60ab33ec48a498f3b2481ef20e23aa383600979126e135ac83a46241753fde8d8446d962292ed7cbe43645b76a22f8f98f6599455adeab83b42f497c5
diff --git a/dev-haskell/stm/stm-2.5.0.1-r1.ebuild b/dev-haskell/stm/stm-2.5.0.1-r1.ebuild
index 338682e39688..8119160c2899 100644
--- a/dev-haskell/stm/stm-2.5.0.1-r1.ebuild
+++ b/dev-haskell/stm/stm-2.5.0.1-r1.ebuild
@@ -16,8 +16,12 @@ SLOT="0/${PV}"
 # Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
+CABAL_CHDEPS=(
+	'base  >= 4.3 && < 4.15' 'base >= 4.3'
+)
+
 RDEPEND="
-	>=dev-lang/ghc-8.10.6:=
+	>=dev-lang/ghc-8.10.6:= <dev-lang/ghc-9.1
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-2.2.0.1
diff --git a/dev-haskell/system-fileio/Manifest b/dev-haskell/system-fileio/Manifest
index c917616b4b50..627154423872 100644
--- a/dev-haskell/system-fileio/Manifest
+++ b/dev-haskell/system-fileio/Manifest
@@ -1,3 +1,3 @@
 DIST system-fileio-0.3.16.4.tar.gz 15632 BLAKE2B 88c773cd78cf21a445c45a7b1548b77ed3624af54f54d0a0388b9c41ffe4595299e32ba4ffa5dad1234f810de73b07f47b16e8e2ad1b490f63811d193523abdb SHA512 68530cd11b25aa8a05967d3f51091ea57a5be138b672bd5373918163281c55a91b60dea03bdd22bcd4ba1d6bb26e2ed14660ce55bbdaf2737d2dd2b7e608d698
-EBUILD system-fileio-0.3.16.4.ebuild 883 BLAKE2B b482f85a193c4b07ff116ca924958c48c7528cb54abcdafe8be325ddbece469c53334b8e6db76704f5e86c2a8ac6347e0ad706c5002d9dc127ca962c857c0b16 SHA512 74fdaf88354961eba91ad3f96b9689c09b3e00cadf69eee724e3b646b3aa45b6f3dc9243379c6a3130236b858fa5b30aa7c9641871fdbdf09a80b3319ad253c6
+EBUILD system-fileio-0.3.16.4.ebuild 918 BLAKE2B 686014a91e1530e26a9b3cadb27a5ae556922b552353b86e61ffde1b74f2f3356f0e13db0138b08f592917f5bdbbf6dc51ba18f59e0323a78e0aa021d40c6832 SHA512 b09e998ad76336f067ebba1c5d280c395ffd9b46aff3dddd0947ed9b2602a59cc1c29f8b8524f97fbf030c0f8c9621b7609fcd152267a9dfc1d6d98f03229223
 MISC metadata.xml 758 BLAKE2B 43433b26cc4b5960622e7cab6726a3cca05ca138d9f153bd850e6c72f862dedb11fa10e5e225b0f3eb1890dd6c4318e56ec33498b7ebdbf08874f5af6e70fcca SHA512 c47573b9ba98bad4f5bbe44b6f81c47bd21bef1497b7a62d8a5b184c099f614620cce9aa3dee5b3792a4992127e5389ee229fb8432eada31d0cae0d33466e969
diff --git a/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild b/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild
index cf3220c3485b..164661456996 100644
--- a/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild
+++ b/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild
@@ -17,13 +17,17 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
+CABAL_CHDEPS=(
+	'chell >= 0.4 && < 0.5' 'chell >= 0.4'
+)
+
 RDEPEND=">=dev-haskell/system-filepath-0.3.1:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
 	>=dev-haskell/text-0.7.1:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
+	test? ( >=dev-haskell/chell-0.4
 		>=dev-haskell/temporary-1.1 <dev-haskell/temporary-2.0
 		>=dev-haskell/transformers-0.2 )
 "
diff --git a/dev-haskell/tagged/Manifest b/dev-haskell/tagged/Manifest
index 78965d1d4d64..69e14fb431a1 100644
--- a/dev-haskell/tagged/Manifest
+++ b/dev-haskell/tagged/Manifest
@@ -1,5 +1,6 @@
+DIST tagged-0.8.6.1-rev3.cabal 2874 BLAKE2B 96959835cc58d33e34cacdfe289a37d0c93db91e8ca72b74f23b82451dc0a4e6a113a1c5bc0a810887ef56d0a140c756c73bd8bf36002ddf5ae58307af084814 SHA512 084047d814fc74bbda9b15a737f498ae182bb498bcae64ae6114a8cfff58e4c238c79b99da30531b4560c9564d4cca08f565aa6929a0b902bad9723f482c8216
 DIST tagged-0.8.6.1.tar.gz 9842 BLAKE2B 6069ea3705dadfec7bc59d81cd9c425e01ad02131e9b6ce4657ad2b59d61a8dc8a420e518ed083a0d8d6b7171e5c233f3a9d96b15045b738c97d4f86fa3887b3 SHA512 289be845821aada538caf3fd0fc85b8ed115c657dc5beb0408816e43cf72153881ad305a982effa572a46e5b1842d2772af44313674cb0a252db8aeb6953f345
 DIST tagged-0.8.7.tar.gz 10082 BLAKE2B f52314aab17206fdf5bad6f334424dde0317f96483509c2da03ee6e823182914be2824350f43e4dd6a7d3e09c34c9d22f00dacba5b2d0f6e2b5a78f204e446fd SHA512 75e8a65a7ebf267a508660e91cb7e265aca3c7b417b4441a01024419f27c0b9614c94a45f0ee58c454492f6e623ccde2d8b9f06cc0100c2f2927efe119fa57ea
-EBUILD tagged-0.8.6.1.ebuild 911 BLAKE2B 7663f6b9b647b05c6b1b69e7e215725c57a0d79d47c31993e89ecefa4ed12b0f9c616501b4cc7c3ff539946c6584768f5df74f31aaa6b8507ec8e232743cdc26 SHA512 922319c65233aaa9d67fbc9d07371c8dc802e7930c9a3f891df0a710d0ca651c51ea96c1b35ea7f47712617abeddd1cb27ab41e3f5a40f51f763febe6337aad2
+EBUILD tagged-0.8.6.1.ebuild 868 BLAKE2B b6fcdd548f469857b007a42c76b92de5feaaa3491905ec42609e2bace6f8d32122eb7fe4e7b69f9cda49d69979582756e1d664aad4ae01ced286da68fb6e812f SHA512 94c214fa67ffcfb1ba5d85914511c8628ef3e183c87707b89d805d6cfa6c8987006b09781468a284b4ee6b2c1b2691a724b5d53b09cdb5b040f6ba181554b8bf
 EBUILD tagged-0.8.7.ebuild 746 BLAKE2B d98d06ee0a786378b037eb6010d29b96b231ccb411c4ff72b3e53e87a3d07ae3849076be92ae3bd501579f6d2abe7d23e85dcf74440df7dc1a87dd18afa34ef2 SHA512 3d1191fb822080cd7fd9fc0e94d24425e135419eba63b860759908133a3efb2e47db839757ad338c40018fb8328ed428fef234cad533f26869815f9030b30d11
 MISC metadata.xml 375 BLAKE2B 52018daf79678f8e9c613b131ef132a8904d16e577a689d27baf904ecd125d80fce7ff94cf159efbb59cf5863579424122187ac19ba74f951005d2c73257ccd5 SHA512 1a0ed20c2b750c889274e1557c16f05084da1991377aab7b0b08ee23f8c285e49c11f87f45f1b30758e5ae743ba37d23ac2f4cfbedef0ea61db7aa00558e7c2f
diff --git a/dev-haskell/tagged/tagged-0.8.6.1.ebuild b/dev-haskell/tagged/tagged-0.8.6.1.ebuild
index 6c1481a91746..64c32b886599 100644
--- a/dev-haskell/tagged/tagged-0.8.6.1.ebuild
+++ b/dev-haskell/tagged/tagged-0.8.6.1.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.7.9999
+# ebuild generated by hackport 0.8.4.0.9999
 #hackport: flags: +deepseq,+transformers
 
+CABAL_HACKAGE_REVISION=3
+
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 # break circular dependencies:
 # https://github.com/gentoo-haskell/gentoo-haskell/issues/810
@@ -14,12 +16,10 @@ inherit haskell-cabal
 
 DESCRIPTION="Haskell 98 phantom types to avoid unsafely passing dummy arguments"
 HOMEPAGE="https://github.com/ekmett/tagged"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
diff --git a/dev-haskell/tasty-lua/Manifest b/dev-haskell/tasty-lua/Manifest
index 3807ede02aaf..33183a0af2a6 100644
--- a/dev-haskell/tasty-lua/Manifest
+++ b/dev-haskell/tasty-lua/Manifest
@@ -1,5 +1,5 @@
 DIST tasty-lua-1.0.2.tar.gz 10413 BLAKE2B 78d09b1c70b53b23264ee5d2b76d32be43e55e3df551792a51626201e405cd25be267cbe2c55dee2c16851877b90c30cbd8bd8b34fd341ce9024ae75e423e5f9 SHA512 0b572e4dbb793c573d28a9e3516926e7f7cba7e962e48de29c24b4da9c2656407cf3a2db21b2db56fa149ef13a70e318f44b3b5de2041863510d31e1bd621857
 DIST tasty-lua-1.1.0.tar.gz 10420 BLAKE2B d771834f6386a93767193998a0136b16cdf84dc07e273265942e3af160560e24d8b1077958c909fa7a9162323f9fb4c42ad52802292b6d8ab17128f060591f01 SHA512 22f002ef8cda5069947f144aaa03d0f17c9edfc3358238de29980244c18cc61058d799d3e156cd40c90e20569c3cae279a3fe264b766e1d179576886404e90fb
-EBUILD tasty-lua-1.0.2.ebuild 1173 BLAKE2B 2d2b33b248d77cf41e8254c8beabfbcd3f97ff51d87f6f2bbe39eff4e6f08ef789d1b5d68c2e36703b287360aacbcb0db207af935f313b1941e68ca52aca3ca2 SHA512 cf3cb69bf62948eb65183617754a826df232848831a1f725d774144418b9365e932a935b6f2f06019fcd84490ae5a2f65395b8591c61c9edc5c7629fd46c8f0e
-EBUILD tasty-lua-1.1.0.ebuild 1111 BLAKE2B da3121efaff78a870088e5dcb227a64040a2cc6319b52f1858551b42bfb4269cec8e08cfe5c1f0abc48178fcd5dc6cb7fffb9a1bf4957f17714f9e5bd5a40a8e SHA512 27344cd50d069136bfa8b769a817de5c5bf67aa7a5c357d9a3c1f008854ed782d7d6cf992c169b1ab91324d3cd76ba9bbde0e0e1e46f54ec6536b1b517c4416f
+EBUILD tasty-lua-1.0.2.ebuild 1171 BLAKE2B 8557f8b1b29e3074617a9afbe707bf6d00493c734ef68930cf6d0bdd17583f5f39c928b91498c4042fe239ddb779d64d2f2de17008fea25a1f255b0cde910b80 SHA512 26f8b1a016bdd49488b615bd2b177b176a62a1c48ab3bc03d4756a45b838bc33aeca964fbe47702845351c3761e836efcf22018d4a7ac704b09f649517aaf595
+EBUILD tasty-lua-1.1.0.ebuild 1109 BLAKE2B c3a4c640a1813ae92f63920f655a538d716e88ce79c0c15600c4b874d12fab3ec5faa314a352e4bbdf157debe6e031a812d08eb33049f9a96ff727726b517473 SHA512 c290c4f1a39347e5b660a94ce90728860a98ea3e40fa0f5d77c1ef03b9fa22c3f708e3f35d8f1ec8f8f5d0999c82a32a05d37b037471da0ada97c29a660f1071
 MISC metadata.xml 376 BLAKE2B f6fd67fabc8b2fe2ee6f7e8ff1cc72ad9ff8f0715255cace48a08b0c4959274570a0afbd20ac1a42b58642f67bd542c5bd92e53a78d5d5697b36ec2ec3826c83 SHA512 c8d49eb7d56a84ff2baad345e9353b4a69cab66bb8bfa8e5025797cba4f547746483e39ae586918e230c8c2cd5180a3ab38459142c33b99463d0c0f9b48ebc8d
diff --git a/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild b/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild
index db27af73d319..e364bb18fefb 100644
--- a/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild
+++ b/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild
@@ -20,7 +20,7 @@ RDEPEND=">=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[
 	>=dev-haskell/hslua-core-2.0:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?]
 	>=dev-haskell/hslua-marshalling-2.0:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?]
 	>=dev-haskell/lua-arbitrary-1.0:=[profile?] <dev-haskell/lua-arbitrary-1.1:=[profile?]
-	>=dev-haskell/quickcheck-2.9:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
+	>=dev-haskell/quickcheck-2.9:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
 	>=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.5:=[profile?]
 	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
 	>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/tasty-lua/tasty-lua-1.1.0.ebuild b/dev-haskell/tasty-lua/tasty-lua-1.1.0.ebuild
index 16250ccc7505..787f5539f844 100644
--- a/dev-haskell/tasty-lua/tasty-lua-1.1.0.ebuild
+++ b/dev-haskell/tasty-lua/tasty-lua-1.1.0.ebuild
@@ -19,7 +19,7 @@ RDEPEND=">=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[
 	>=dev-haskell/hslua-core-2.3:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
 	>=dev-haskell/hslua-marshalling-2.0:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
 	>=dev-haskell/lua-arbitrary-1.0:=[profile?] <dev-haskell/lua-arbitrary-1.1:=[profile?]
-	>=dev-haskell/quickcheck-2.9:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
+	>=dev-haskell/quickcheck-2.9:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
 	>=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.5:=[profile?]
 	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
 	>=dev-lang/ghc-8.8.1:=
diff --git a/dev-haskell/tasty-quickcheck/Manifest b/dev-haskell/tasty-quickcheck/Manifest
index 37cabbf8071d..4217ce4e0be4 100644
--- a/dev-haskell/tasty-quickcheck/Manifest
+++ b/dev-haskell/tasty-quickcheck/Manifest
@@ -1,5 +1,5 @@
 DIST tasty-quickcheck-0.10.1.1.tar.gz 5539 BLAKE2B 688675aa15f2790d147d34dbeca8d42e556b8a2d3fe52c7687e149f271a0ddcbb6fb21ac6be4065fdf1b8dcb82aa10a8f533e77da0111c140bb9ef807e48c222 SHA512 13cfcc99eb9988d4842327d96f0e58f5ba6c653d3027a4adb307d4101bc2f7deee0033197b4358a837ace0d03423bdafe2197b029da6a64d8b650ee2f5bd958d
 DIST tasty-quickcheck-0.10.2.tar.gz 5868 BLAKE2B 74a4870c547f716378fee7aae7e628ca69d3364f22cd62710ed0321abcbc2a94f48fe8a0c89e0aab62bf380247422ee5f0cb5fa122ab3e33219981a6e8ce4142 SHA512 78b223fc54428e71b1a8b3afba1128764e61703be4dea95541e0661d2fbe3006b77ef15200577e40bf3bf78a557f66f13a77288c8fe87dc19eb343c9fdff9d89
-EBUILD tasty-quickcheck-0.10.1.1.ebuild 836 BLAKE2B 31effdb6f017e1e72c9c842fbfbd833e781a9fd6ba802fbba57a3e4ddf44e8f8482fdea7ff6cb28ac9c3b05eac257a3848900693a4b41cbfdd6c9721d6769f3c SHA512 22ab1133e26b0bbd0eced8ab3e74fa761eb6f94eac4628daec655568b2dda1a236d12dae8409d666959a5a7d15b270c67b1775cd868f79c85ee8516d87a4d4de
-EBUILD tasty-quickcheck-0.10.2.ebuild 766 BLAKE2B a4368eedb6a8afd7c0fe75a7aa1ae598eae45ead6d03d5795f512a03ec5b8c05e5e8ec79171192a13ae5376df0729cc990a300fe6b649372fd74276c03b23c1c SHA512 85f4704fa23b19b51d8564e3f6670ba8d2a6571483bc0f2a53acdb5193f628630464aa2a09887799ee906c96f8c296bbaa09d44c1281f015dd80827af9b95777
+EBUILD tasty-quickcheck-0.10.1.1.ebuild 835 BLAKE2B de2f81e6a7eb265ee5e028e71cebf7d8e07597a7516b53524f24f0f5ceb6c30bb8b2ece388b51263bf7f9163c0d296e5a336b6f37faf1c5732f933e9f1744e3e SHA512 cd5cd7158d18e9305298b52922b68a45ff3973f1a467ad17cea3ebdd88aff16d39d941f4d179fd21c9c26e973c0950f3239a62e14976fdc3c5818abd1cc3eb46
+EBUILD tasty-quickcheck-0.10.2.ebuild 765 BLAKE2B c9d478bfe6f3643ac101ab7ec2ca733b91e328e848c84035e7e2bea64382a259ea722f9a0b0836195ea9031af5bd779eb1fbf56c847dabd8381ca8cedd449e9c SHA512 a67410205b4b479174a6d540a1d138e8a5eb320857124d2a0e5a645df4d634f8b05d9a68e83cf139999f3d7176a0578c6406d320bfc925630343c91211ec8850
 MISC metadata.xml 393 BLAKE2B eccdf00788ed276fd22838124d7ddb1364cf0d2ad70cd7f796dd1894fa9c9bb1b1930f2346a740c95dd0e6df769f82398f3f178a6b22594c49edf33f0999c1d2 SHA512 9cc5bfa0e3bfe89d58e9d101ba2198b17b59ba6da21c1f08209451c69041a42b352377d66fa8f03fef99c38baf33b6b0b1262a7a1b93c82358ebb9257015496a
diff --git a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild
index fa7412f3b4bc..2c998919b3f5 100644
--- a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild
+++ b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/optparse-applicative:=[profile?]
-	>=dev-haskell/quickcheck-2.10:2=[profile?]
+	>=dev-haskell/quickcheck-2.10:=[profile?]
 	dev-haskell/random:=[profile?]
 	dev-haskell/tagged:=[profile?]
 	>=dev-haskell/tasty-1.0.1:=[profile?]
diff --git a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.2.ebuild b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.2.ebuild
index 7cef49a8629d..f9bb7b4d7cf9 100644
--- a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.2.ebuild
+++ b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.2.ebuild
@@ -16,7 +16,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="dev-haskell/optparse-applicative:=[profile?]
-	>=dev-haskell/quickcheck-2.10:2=[profile?]
+	>=dev-haskell/quickcheck-2.10:=[profile?]
 	dev-haskell/random:=[profile?]
 	dev-haskell/tagged:=[profile?]
 	>=dev-haskell/tasty-1.0.1:=[profile?]
diff --git a/dev-haskell/terminfo/Manifest b/dev-haskell/terminfo/Manifest
index 4c06b568f09f..75039db7497b 100644
--- a/dev-haskell/terminfo/Manifest
+++ b/dev-haskell/terminfo/Manifest
@@ -1,7 +1,4 @@
-DIST terminfo-0.4.1.4-rev1.cabal 1713 BLAKE2B 01ba0752284de317c02b1f198f451ef0571dc5b98425a5b88cd96c2b08c9ba7971308ad9924f9ef0cbd89473a1ce87046bab1da23b1b1e75f5e718448520f335 SHA512 a008174448cb973e4f5c138cf213d2f8b7233eda81cfd890c82e7bf7fe7f4acae60ef7a8e4b2b12fce5ec09728501e6f042073402bf0d8c6dae9316222c4b47a
-DIST terminfo-0.4.1.4.tar.gz 42234 BLAKE2B d20920290bb865982d3dac1647a7bad8d75dc7782db249286fa0fcd70ba1bf532da174bc0925f13c6870a2949c7d3b033656c13f5906f09000ba7d89ace4102e SHA512 3006b7c4a0628cb0f28cfb9af8172410a194ee9dc24e1bd121a94d5c5bfbba09ea0b232412eacc7f6705495511077a427ef2aeb7fff2af7cb80e25823aa1667c
 DIST terminfo-0.4.1.5-rev1.cabal 1713 BLAKE2B 1f065369dda9b27ff1959ed7071cf71f3f756efa37e1e82c24230e61f88ec0d8392a70211071ca7057bf12011113f28f49aa9dee3f0837eaf21118e3b4d1e149 SHA512 68686c54a1400dcbd76fefd95d564939ccb34f53f5c880103e359c46cd1fbd81480582e271ba9a2c58a0bc6cc6b073609340e301df6824ae61c7a0a5ba2b063b
 DIST terminfo-0.4.1.5.tar.gz 42371 BLAKE2B f7ada992d945ee882f405925134fc0e396d3f5dd79387ea4c1cd0aaaa0e8b2c447b71a4ad6a9e407cfd43b3f4e3bfead2b04fe92ae34fea62185ae7e836980a3 SHA512 1aa802ded4efa2903b21e31cbb3dafc8e712ba3c58388a5c369224644c80f4886b4fa28671a4fdcdee621cabc80edc131a16e5fe0e7302c8398572676060c091
-EBUILD terminfo-0.4.1.4-r1.ebuild 606 BLAKE2B ef2af8b28e9b1090bc519e14c4caafd6d6e49c5cc2d72323f184b11da73dca54bf54b156405730f5d15eb09ceb29148e1c079e1891264e1b6e58b1fc75bab423 SHA512 dfb1213972ff9120287592eabf3247f9a139a2d23fbdbae4394c315ec3782735625c068fd9e5fcce00d0795f0420dbdd692669e2667edcc140dcf8acf28ef4c9
 EBUILD terminfo-0.4.1.5-r1.ebuild 659 BLAKE2B 55be7aa0e57bc2aa73e3300d8bb1ce826fed76eb084d315b82da65fb5fd2f84b7c4ddd4670e5033ffc78f75b6a927af830d606edb766be46f6909318842a5d7c SHA512 df54630717b2f82f1b46f850a8048b0b45dd43ba8e889d5d3f1b035fe9be0cc888bd16300f1e98571b060b220eb525d71806638950664cd65be4db60d2e388dc
 MISC metadata.xml 378 BLAKE2B 17196840bb452e0330ac28ee2512a46d82f9f00832427ac7aaff2d98e94a0c6d9fa2712feb27a93cc7bcec99c0ba4fb9ee985b16d44c0933a72f11210399a0cc SHA512 6e19e037498d0facf42b405ac223bab0369978172f76edbd7e2584d3f1d74e6e3b04b0613c907a1b1f3b086eda94f18ac35f9f29460e19aa67a6da6998a8124a
diff --git a/dev-haskell/terminfo/terminfo-0.4.1.4-r1.ebuild b/dev-haskell/terminfo/terminfo-0.4.1.4-r1.ebuild
deleted file mode 100644
index 8a294c24d0c3..000000000000
--- a/dev-haskell/terminfo/terminfo-0.4.1.4-r1.ebuild
+++ /dev/null
@@ -1,28 +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
-
-CABAL_HACKAGE_REVISION=1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the terminfo library"
-HOMEPAGE="https://github.com/judah/terminfo"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-lang/ghc-8.10.6:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-"
-
-CABAL_CORE_LIB_GHC_PV="8.10.6 8.10.7"
diff --git a/dev-haskell/test-framework-quickcheck2/Manifest b/dev-haskell/test-framework-quickcheck2/Manifest
index 2253bcb6bf94..5829b59a2c4f 100644
--- a/dev-haskell/test-framework-quickcheck2/Manifest
+++ b/dev-haskell/test-framework-quickcheck2/Manifest
@@ -1,3 +1,3 @@
 DIST test-framework-quickcheck2-0.3.0.5.tar.gz 3844 BLAKE2B 1c7ace7b85200d3ce1bcf6a48dc10d912c4cfa255eaf100b37d018128a4e014703cf378b2fee74355c1731d9062c68b164da96f6f672a10af460d41ed2b2d2ca SHA512 58c6177d52829ba1ea1858a11101e5b21ae4e4543f8f829779f62208ad16083b41e9f3b2275392693698ef3d46912096c368d90db0d67ff136af4fa73d5e1d43
-EBUILD test-framework-quickcheck2-0.3.0.5-r2.ebuild 1149 BLAKE2B 7b71fe63a8494f742734121b611135c1735e293dda037afc08b56294dcf7277f3baf08269823d7e2e3aa6b474f3bbd89c1eef554a54ea3bc4239112c47cce5cd SHA512 d8a3dec41e7205447f6559b636f6a869cb58b3477c087247522a1dac8552cab4d0a83db3d8d97283e1df3adcbf9ee4e663f5c63666a085e94af390d0d899296d
+EBUILD test-framework-quickcheck2-0.3.0.5-r2.ebuild 1148 BLAKE2B 92715a63ef8ec7b65d900771fe9ac7a6c287f098a18c3ca6ed63d7294eddf24a946b74998bc7c3b00b8e01ae76a4e95887a8b1bd9bbc1159bcbb9ee5225bee31 SHA512 be6912b42ab14e7013962b1163132c495130022a54e56e69b11993bc006ed5b69ed648b21a6c9c691b29399516dc68a16f416fb108aa412e3ef0716d95b1459b
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r2.ebuild b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r2.ebuild
index 77325980858f..3dce34339afa 100644
--- a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r2.ebuild
+++ b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r2.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?]
-	>=dev-haskell/quickcheck-2.4:2=[profile?]
+	>=dev-haskell/quickcheck-2.4:=[profile?]
 	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3:=[profile?]
 	>=dev-haskell/test-framework-0.8:=[profile?] <dev-haskell/test-framework-0.9:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest
index 1ed80fd09771..a3ca5a55c263 100644
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@@ -1,5 +1,3 @@
-DIST text-1.2.4.1.tar.gz 148905 BLAKE2B 5e3429e3f83a2c12c5482e342fb4a1846538bdf453df23c2144af01d0df3f5a8b831fd76513aea6e303b5a36b38dec185fedf960060264fc49fe917e30964b41 SHA512 4170d9a463cebfbd80b7902e4d71ed1a1f29db96d2cc9045b79908509a633a239edb3b1ff8dac6970074c4d7e91c552e106756d8142709f8fee3a960428c23e7
 DIST text-1.2.5.0.tar.gz 155890 BLAKE2B aaf7206dad552ff98a465914ad8183ec1ccd57e56504496a5b8d11645b0f0fb395dd801c9b6fe32b51ed3902658eb5e5fb92187de668d32801597b4eb904b820 SHA512 dbda65180fc012324fe45467b63e0f53e7e0fa2da3b11875e458ba6bd31d0ee7634121967d2aa6853ed5c907c0661dcc59b8c68fb55edab2923490d8b50722d6
-EBUILD text-1.2.4.1-r1.ebuild 979 BLAKE2B 94f5e633512001601519f5c1e2e77083b39aec71cc4f853c8238b3451988cc4abba20c105e6a0b89c3e4a377132b2a0be911d1942d72066a6a19db030c7dcfd8 SHA512 d9e3f9ad4f50b1814e0815a1966cfe3ff607b90f0f35727ff7ed78ebf31471bc54258988a1887f918b3dd0593d44641c7f575564cb95ed68d7fa6a9affddd767
 EBUILD text-1.2.5.0-r1.ebuild 1269 BLAKE2B ca9e6c469ada3ddc19375866ad08a95b7bd53f67499d2ed384e6e92be36ee3ea16a0aedb072ee8db592d84588e20c7723474ff4eb260fe9a717109c0b091a59d SHA512 22bd16a106170c81acbc1aa0c9f361e2e4c53c6f8cf60119be5e02e4071e77c2237cee5573eabf6cf8b07d0a8fa7cea224d1b8eaf6d9076484053c9350c76477
 MISC metadata.xml 372 BLAKE2B 8ee7b3bfefe92f93ba1c4bed51052522fde280b6f5665cce5310da1b69a987760c485708d45423b18eee469f25a3ab819d86bb775f2d688d7e7710c1fe7126f9 SHA512 259f2931232c07df32946a4a90bc7f3a3ca1039b2d901679c264927ef5f12506921922f1f82171c8b9959a9d8db8929dab73abea96947e07c07ae466e156998a
diff --git a/dev-haskell/text/text-1.2.4.1-r1.ebuild b/dev-haskell/text/text-1.2.4.1-r1.ebuild
deleted file mode 100644
index 853e1268efcb..000000000000
--- a/dev-haskell/text/text-1.2.4.1-r1.ebuild
+++ /dev/null
@@ -1,39 +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: -bytestring-builder,-developer,-integer-simple
-
-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"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
-KEYWORDS="~amd64 ~amd64-linux"
-
-# break cyclic dependencies, test suite requires porting to >=QC-2.11
-RESTRICT=test
-
-RDEPEND="
-	>=dev-lang/ghc-8.10.6:=
-"
-DEPEND="${RDEPEND}
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bytestring-builder \
-		--flag=-developer \
-		--flag=-integer-simple
-}
-
-CABAL_CORE_LIB_GHC_PV="8.10.6 8.10.7"
diff --git a/dev-haskell/th-lift/Manifest b/dev-haskell/th-lift/Manifest
index 7649d1e560eb..13a462f90926 100644
--- a/dev-haskell/th-lift/Manifest
+++ b/dev-haskell/th-lift/Manifest
@@ -1,5 +1,6 @@
+DIST th-lift-0.8.2-rev2.cabal 2677 BLAKE2B b6fc00a24607b09d9159c44d74abb852b6a0a7223422b8693ecb93390fd92ba2aec3db54311d45331a3ff3b914232387c4bac3fc46ff4b347a13d06cb40127e5 SHA512 6350106296d52acdc64bd2f183e23ee560b4725e831ce0549a26bd8faed80a632fe09b5e358ac4d06765fff222d13543badbe2218c9f5768e6b37ea4ebbf4c25
 DIST th-lift-0.8.2.tar.gz 14385 BLAKE2B 31c02c810a3260450e2efd79e4271d326341cc8a8fae9dc3d0293b4b065978cf9d3e676fb54d003d385d21def498f03014c8065a14c9f90931a2843add8349c0 SHA512 bda1fd661274d911898eb163427a83db81bf5cc6d7cdd2936a84cb314268be2d38c5753727c1e87e83f8edb61e8bbbd0976001f680830b3bc2d4eb96178505ec
 DIST th-lift-0.8.4.tar.gz 14711 BLAKE2B f045220e93221186c43fad301c1c97f16e35c3651f191f5bc710ca2660cd23dfff05f707c4ba0151cb17eb0ee5a39bf2f36d49511553e23f9d9d8915d47b322a SHA512 fe5d47cc5b9c4a6128761d044ad00262e316862888a218279b62b51b87f32398c534ca65407491d210e7d32bea53c77161333b98bcc969e077221f2d9e3c56f7
-EBUILD th-lift-0.8.2.ebuild 676 BLAKE2B 6d9e7309ee58c02b4f8a15051e8169f158ab3c5e3aa97acd46dc3d5d9f93107f408d9bd7a19a570a68270d97e9206ec3caf002a9f5e200ded35a7f0315b8538d SHA512 2f398cd79e2ff601c7edf8fd5e3a39578e27d9351ee26cd4be2c21f4b16f79ff61bc58fc957c86bca33d3f7b074f5fcf390aa5bcc60465ae58d5c48db98cb6df
+EBUILD th-lift-0.8.2.ebuild 633 BLAKE2B e05d8186267d7027a0bdc0551a55afadc909cfc4872daf7c9a11991d72bb41c1041804190900a500adf35eeed789703d428fbc466f908b8bbfa608234bafde71 SHA512 2aebebee1de8cb43ddee73451c939b15d43e210600700b500b184423326ad8316a0ac3b93ce7136563b9c6244399c80411aa8a5aa0ed54884af9c889bf300352
 EBUILD th-lift-0.8.4.ebuild 609 BLAKE2B f26bd5cf73d94b69d61ff297359c9d0ad172f8126ce5bac9db4a57d808507946924332cc983e23b5a38bc9c0a0d43438921a13d4c770f2cb2f44b60054fabd75 SHA512 2a673418e48bbe91509c4d899da3726738d7e5c664746314111e324eb9c1a6b021851fea6218c6e0c3e2df9f18f60d937a90f3b474bfde0f85f5607a266b22c4
 MISC metadata.xml 382 BLAKE2B 0bfe337a0f6240d76d55fa9d82053ade4957a3b640d3cb4c0da9cf9cf47cdba3676cb91a3a3d11a105a148f9345c6bd44a9eb6a99590e81b786c902ee9249185 SHA512 25b390767d6b0df646af83dbbc6d74acc3fd9533836da0c6b6fb05a8ef9e9243399fcb6e6dc6f5b0fc8f0c22d515cc9dfc4bfbe24836ce06f6ef8729f4e455b6
diff --git a/dev-haskell/th-lift/th-lift-0.8.2.ebuild b/dev-haskell/th-lift/th-lift-0.8.2.ebuild
index 6f1b34d48543..ad13c913e8fb 100644
--- a/dev-haskell/th-lift/th-lift-0.8.2.ebuild
+++ b/dev-haskell/th-lift/th-lift-0.8.2.ebuild
@@ -3,19 +3,19 @@
 
 EAPI=8
 
-# ebuild generated by hackport 0.6.7.9999
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=2
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Derive Template Haskell's Lift class for datatypes"
 HOMEPAGE="https://github.com/RyanGlScott/th-lift"
-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-haskell/th-abstraction-0.2.3:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/timezone-olson/Manifest b/dev-haskell/timezone-olson/Manifest
index 62f3839824d2..bfd36e9af61c 100644
--- a/dev-haskell/timezone-olson/Manifest
+++ b/dev-haskell/timezone-olson/Manifest
@@ -1,5 +1,5 @@
 DIST timezone-olson-0.2.0.tar.gz 11301 BLAKE2B 51782a94097516e40f7f71548bd1f52ed673836a5bd289634f60bc9293534980966680ca689f584d15eeb0acd8a186ce9c8effb39a6c718008b1690d9858681e SHA512 06c73b24b23caa41f3dce472bca384e3ee7ba02a3dd8bc4458bc758bc6aabdeca9be299f16419702e860f38ea213fd62d90e63fc4746dc2015c0e06b15aba6dd
 DIST timezone-olson-0.2.1.tar.gz 11290 BLAKE2B cc352ea26a06b2405278e783a9c961f71418f59805985d976e531ed35f1ee8e72ad064352f5ced0d42b6c3c195adf20c5ff2a40839c83ec6aa1341c7b05f3dc1 SHA512 243ea612a4af206d629ba1f3b3b01b1470e849a5ce50c2c189da246eac6f043ac7fb4f039df94053c7a1da9d2aeb347e510560fd0fa590264a5e3897a8dd1300
-EBUILD timezone-olson-0.2.0.ebuild 782 BLAKE2B 961184e416871dad0259b5419be692d3ada99d5283f9ae123c05369c48dd2786ce2f0951d223c6cc33bcbd796fbb7d02f4f8eb35751880f98805c58cd9c1d141 SHA512 1a2053c26122dcd8c1c6e2b58184c3ce4f0a87e491447a9cf310cf1b367e6a0e89487942d8687972a0d12a5b864b8a82b5d1f8618752574d429e1cef27e3fe61
+EBUILD timezone-olson-0.2.0.ebuild 839 BLAKE2B 5586b20ec6846b70992c9afb94c3e64b6fb0acd3a40496108c2abb60ea417a2a5db8b374ca9ce711f089f35897d9b9f19dbd7f00b03ecd60838ebbd60e3b2e8f SHA512 b74df79e5a99e6adb19a932f59a8145b1bce815e214abd5d589d2849172eb062fc25aa61a79d271feddd84ff3ed3fbec82118916cac39ba8bfc299c770abde64
 EBUILD timezone-olson-0.2.1.ebuild 723 BLAKE2B 1f86167a7094fdae1fc402a9df191c0797a9ccf66070c1089b3228d3f4a318040b5c613fd55bc858a8ee65115ae5018cea2fffa8128d51ec13baee3fa0c35a2b SHA512 982b4cbba88d3314b66b8bd3db0dff745d8049df9d92605d5f60615d6e608df00a76e24dd43d7ce16097949c98bf88828186785c0de5a1ada91ee488c12c3d78
 MISC metadata.xml 390 BLAKE2B 6d9e1ec3061bd27130a06adf76bd58ffd2f3658aad882fbd6ea4634b4bd319f735e7f72c520b40e4e41aeb579f90deef86628347bc4911d2deccc8d0c04ec73a SHA512 3e06e93919775d77e8af60ae35177061dfa4a77f1589895fd96cd0056b8eb7028f1d45bace8a0d11c7c8047f125a7307f29e0516f9e4d505ec354341984d198b
diff --git a/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild
index a0590ced9c25..45ce3705e5a2 100644
--- a/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild
+++ b/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild
@@ -16,6 +16,10 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
+CABAL_CHDEPS=(
+	'time >= 1.6 && < 1.10' 'time >= 1.6'
+)
+
 RDEPEND=">=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
 	>=dev-haskell/timezone-series-0.1.0:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?]
 	>=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/timezone-series/Manifest b/dev-haskell/timezone-series/Manifest
index 00ea24b0728d..c9858dfbcd63 100644
--- a/dev-haskell/timezone-series/Manifest
+++ b/dev-haskell/timezone-series/Manifest
@@ -2,5 +2,5 @@ DIST timezone-series-0.1.13-rev1.cabal 1528 BLAKE2B 75c04c5c149cd7fcbc4670ab1f2f
 DIST timezone-series-0.1.13.tar.gz 5682 BLAKE2B 284ba6c0c4b17bd2d2d6074afdfef6139b487ed2e9799a40c1f7389c30410f87f0d84f3dee163377ce378dedbb1a91f68416ed1830685e7854126927ba578d90 SHA512 7e98bf1030f9df88d031f8fe28e56f50bd8e5da7615165324b5132a77aecc70da5906e2068afa43a819d711725c4c6cae8f6d17e7803f50b31038eb1634d4992
 DIST timezone-series-0.1.9.tar.gz 5812 BLAKE2B d45a62af6ac050406cded2740acb9988a25e38f80637e8dc8d7856786985ffe22a287873f878312faeddb524189a169af5ea6c1109613106dfc70cbba80b8b7a SHA512 9a716223270dfcb0ed39e2dcfb460e3540c0f2444f703c466cbd48ad5664e689aa3f6595f32e59b96fef7891aafabc03c9925367a26c2c043cb6adca2dad7a88
 EBUILD timezone-series-0.1.13.ebuild 523 BLAKE2B 5cba45c8e5133a796cf05d6563dfc48ec644102a420738efbe8e02083109c0363aabd80635d358a57605bff2ac61ba9b196582e60efa57bdddfa88b8cb5e8cb7 SHA512 5917c233eb803fde93b49901c5f0f69cc110d00864eca0809f81697ff5f4d7b7f6dd0c36e9e448a31df4b267100c88effcba7e021d65d6abef0657583cbf8244
-EBUILD timezone-series-0.1.9.ebuild 556 BLAKE2B 867005fa0b99ed185d04621c24aba29ea049372715a6e022c4cfafeba96cc3f22ef017723908db06598884ee30a3f895643c13d9b6fcdab4ba567a9cb3807aaa SHA512 7085b4921c7d5f107e4c67f13f264b8bf0e3c994873765ab6a141944610db125334f201f797f93d00c46f6ed634a2c0482592d1e1e60582c9a559224e804a571
+EBUILD timezone-series-0.1.9.ebuild 641 BLAKE2B 66fa1721a81c71d69fb23cffbe2338bb57a18a54ce0f24a7ac76db4ead2b5041174ed10f4d6b8f0d9edcb40f94c4634a78ef94dfaa97e8efdc19dcbbd07e1fc5 SHA512 a21924536d2bcc90d262df8fe963cdba6b06b1d7aaf939219bf3978f895849a5aee21086743a8786a3d96e3592c9ac6f9298d05387933a4571b4897bad21a6f3
 MISC metadata.xml 392 BLAKE2B b6fe6c3e81f7a3cb0d114f7322a2cceaed8164973bf49e1c8fa081425e569ca75c087cc20b61a964d13c71b0a2841bfae8e1282d84fa2dcbf0bbd1aa6dfacf5e SHA512 829f47fc548ba6ce68d8ffb65a8b793f2f02079a1671f20fb89180f47412453dfd46974804bc1d7cbfc6006bac49588143e32022a849e3d34550b7c118967ef4
diff --git a/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild b/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild
index 3e504799b0b6..e02ae7a01c97 100644
--- a/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild
+++ b/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild
@@ -17,6 +17,10 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
+CABAL_CHDEPS=(
+	'time (>= 1.1.4 && < 1.9) || (>= 1.9.1 && < 1.10)' 'time >=1.1.4'
+)
+
 RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-haskell/tree-diff/Manifest b/dev-haskell/tree-diff/Manifest
index 60d25ff669d7..28a09ff75b15 100644
--- a/dev-haskell/tree-diff/Manifest
+++ b/dev-haskell/tree-diff/Manifest
@@ -1,6 +1,6 @@
 DIST tree-diff-0.2.1.1.tar.gz 26042 BLAKE2B c136094949b96069996ae2a68c49ca3476f75909138135a138b1c1f07b833413472d2c497418a8bb6c0c17164e78cf180b548c0d4ab5806269e7348aa86467ba SHA512 07bd947b145ebf894a5f830601529517d003bf4b0ffc9581c8204d710ed8d3941f764376add84ab1757c7d3544e984166115f37c1348a32123d99aea816a0686
 DIST tree-diff-0.3.0.1-rev3.cabal 5422 BLAKE2B 1e0edff3db263a9b1929cc8e9115a8cd226a40327a61c1d1e2f49500da72292d324bc232aa6a2b0499f2c4f995ae02d20e86d2d21d38ae358f53e0fa2a4c3a66 SHA512 a33fcfc3a3a312ac3a3d11c4280e01ccc3664da52fd8f11ef51ae2c5fab86500557d890d7ef0cbd654af30552fa88e3b15d78d7310a18c8c32c9bcacea324187
 DIST tree-diff-0.3.0.1.tar.gz 26603 BLAKE2B 2456836d111e689c5101703a617a384b31eb46f12d9a6ef54e863d9e537345729432f2784f2f33be681e413fd400979cbe81d3fb50e49b0627d2a7edefa7eed3 SHA512 69244dcf5bca996e6c08500cf1841e68fda2a304fb811d788d2dd03e79076496bc12bfb1d3ac3f30c01929bbd617f009e2a78c1a7b23284cd41d1f78d8e6d20e
-EBUILD tree-diff-0.2.1.1.ebuild 2421 BLAKE2B 0ecd537aca54405f00ac79221c203c8e14af12636e68ce4cfb6ab28e480dea6740f3993a1543e0195b07ca00bacc2bc019bfffd3755e6be604ef386c10018b03 SHA512 8f42ad4ce6e56c5b3d00d0926957e3e882862806e19b103c1dd806f578aac558ba4ec892d8547622c1839d8a78a738f14bcaec89479866171dddc5d72098673c
-EBUILD tree-diff-0.3.0.1-r1.ebuild 2677 BLAKE2B 38046f4dec569b20e4f219d585ab9f9f8c71ab5cbc6698c9a897b4880c9bb411a9857a3e21732b32bb8731912333c3dbcb078f8debccffa164fc13d8dae0edb4 SHA512 73b4077b56044d9aad5a3c8e942ff3e583864f13d7a90f91b01b869c4c764dafee1dc83de37ed2a659c27f2e1a98dda944ffc8b9bd353cf5cd9e06de199d47c4
+EBUILD tree-diff-0.2.1.1.ebuild 2419 BLAKE2B 3703ea7d7e569f6701961bd945261dd9e0efc15bff92788d28b23830bd2fb4b418d5b10fedcc8905588bdd6786e0248b047640ebfc2efd2aaf8904006468816c SHA512 1afe24f955a26c4cc3954e85e0f3e7148fed0bc7c4033ae35292a561c021b550553dbeebf98c8ab8b6f181116d47eecd7571733ca1ac7bc3f8d951d06954b8a6
+EBUILD tree-diff-0.3.0.1-r1.ebuild 2675 BLAKE2B da6ec78a644fc6709812a7372cd4d491fa90b6ec5c59e4d8613f7ef117c5960f2958b1ec33794a99895500cafbf5703b916fa61fea1b3603e3993f266d25c361 SHA512 be6242e15fd71c85b15913c0bd252be0afa7a5fd027ea573116be3b3f5f6f1ba57bc3c273aee76e22355ddfbff1be316999525ecdeae41bbbe2e6d6d29631117
 MISC metadata.xml 381 BLAKE2B c0b2236f01ca920381d390a53b1ae5ff5b1de2ab27d6acf74c3a0e204057b524f374d1656f14df18c81fc92d2df591e4da967cda1771eb2ff550d0b04492d97d SHA512 46bb5e8e870715a04d88a6158d549d0a03cc731b711cc470f78894e98259b334e3c45b068a4ba9799ee36854aad2c1b71b5fb0e24318f70973b9f3c4afd09df3
diff --git a/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild b/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild
index fdf42ed51e86..a7aadab49bfa 100644
--- a/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild
+++ b/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild
@@ -21,7 +21,7 @@ RDEPEND=">=dev-haskell/ansi-terminal-0.10:=[profile?] <dev-haskell/ansi-terminal
 	>=dev-haskell/bytestring-builder-0.10.8.2.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
 	>=dev-haskell/parsers-0.12.10:=[profile?] <dev-haskell/parsers-0.13:=[profile?]
 	>=dev-haskell/primitive-0.7.1.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.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
 	>=dev-haskell/semialign-1.1:=[profile?] <dev-haskell/semialign-1.3:=[profile?]
 	>=dev-haskell/strict-0.4.0.1:=[profile?] <dev-haskell/strict-0.5:=[profile?]
diff --git a/dev-haskell/tree-diff/tree-diff-0.3.0.1-r1.ebuild b/dev-haskell/tree-diff/tree-diff-0.3.0.1-r1.ebuild
index eb98d9423a66..8ea1fdbfe853 100644
--- a/dev-haskell/tree-diff/tree-diff-0.3.0.1-r1.ebuild
+++ b/dev-haskell/tree-diff/tree-diff-0.3.0.1-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND=">=dev-haskell/bytestring-builder-0.10.8.2.0:=[profile?] <dev-haskell/by
 	>=dev-haskell/data-array-byte-0.1.0.1:=[profile?] <dev-haskell/data-array-byte-0.2:=[profile?]
 	>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
 	>=dev-haskell/parsers-0.12.10:=[profile?] <dev-haskell/parsers-0.13:=[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.6.2:=[profile?] <dev-haskell/scientific-0.4:=[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?]
diff --git a/dev-haskell/utf8-light/Manifest b/dev-haskell/utf8-light/Manifest
index b051f9afbb43..075c15503f21 100644
--- a/dev-haskell/utf8-light/Manifest
+++ b/dev-haskell/utf8-light/Manifest
@@ -1,5 +1,5 @@
 DIST utf8-light-0.4.2.tar.gz 5821 BLAKE2B 50f9ed9201458c90306200538e583f9a696f99aac394851da430dd69263789dccf9c4b188319bdbfeaec3542eccbbe7f4b336028953d513973b98718a4a22c18 SHA512 83777117a24a4c456134c0591e59ec010cbb938a5ddac8fc68b8204c7999aa2a36ab158b14e5b7bded1ca9cc4596f448b0e7aa5d194081130d7aef623d7c6bc0
 DIST utf8-light-0.4.4.0.tar.gz 7398 BLAKE2B 0aad5a2cc1e01fed73c6511dcde0f9d2cf25f229060cbddf7743d9d27d85d32a4028ef794e967d76f44d7df62acd618d9935ccb1f6cf9c7d8b98ed2166a1c6e7 SHA512 750ffdc68d7545ade1718361a693438cc3368003eeafb325912a48183e64b8131c219edb9cc56f5f582bd1f745152ff7d409bf0ade4fd7e542669c2d24977976
-EBUILD utf8-light-0.4.2.ebuild 555 BLAKE2B 378f74f6a4cc887004a50041d33c360eb5fccb6335b4e515c2f1f8e4275112501b787126771a84a509f3f5172b2058d9cf7a8beb5b9c2a0ccf75930592cb159d SHA512 e0abfdfc767bdd650915ada5f55ac3da0cd7adb29a88e88ae6865e302ace7dfb6de1034fbdce3a1bfd3ca5136303db7ae945f1ea4a19866a60a693ac89dfc40b
+EBUILD utf8-light-0.4.2.ebuild 573 BLAKE2B 3d0df37f65389276071ad580ffbbb219ae83e3fb96fd4f458c86457711f228f9b1fc494c5cb2c0ccf3020697586fedc3c42e6609e7bbcd7f3befb4929274db71 SHA512 7741ddcf4fb732846ea9ed4b8d7f486c2004179e8a0b3b632b69e9c785c210ef1667317c9154287ffa9603c036bcf6f869bb016483410273a935dad07296b5f8
 EBUILD utf8-light-0.4.4.0.ebuild 564 BLAKE2B 5eee813a60df641c99dad5b8903dfa0740eff875d60f658f2e66753a622fc7c832ec6b170d65967aa54b1512e4ee5b39d71f78d18e7c6144f53916ba7d10b14d SHA512 a0ee85b6e2e99fcf0e5207758e7754e2491c6deecba439409299836151a1114ebd47ecdbf54bb1f8fd8b42f02bb4ce8cb64d4cf893ea9f56d2a89a4af275f22f
 MISC metadata.xml 383 BLAKE2B 5d54f7ead91a5f08e41f92c00e096dfe81067096852fa1724a48f7a269c6762dd95290447c0439e0228d6794cfa5d2568f4cd89cd4d2d45e1afd8e91c3ab722c SHA512 b73569055684fc7452f386df41c8fca4c2360786c576c9140e0a03fd5b927f6962dcf49925f649d773103360ac48f873a8e0602a14f7a766ae2651ce016205cf
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 3af13fa76b84..a664ac352d08 100644
--- a/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
+++ b/dev-haskell/utf8-light/utf8-light-0.4.2.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.6
diff --git a/dev-haskell/vector-th-unbox/Manifest b/dev-haskell/vector-th-unbox/Manifest
index 76829709d731..468708b2c49a 100644
--- a/dev-haskell/vector-th-unbox/Manifest
+++ b/dev-haskell/vector-th-unbox/Manifest
@@ -1,6 +1,6 @@
 DIST vector-th-unbox-0.2.1.7.tar.gz 4771 BLAKE2B 72d25981c2dd42bce7028d94a1805ad9a836cfbdce9dfb8bdbfe2f1aa26f4180ea8fc02b3323eccaa11c53065659ddc25063460b737831cc565ae08cecc914d4 SHA512 fa65c32eace3ad93f0df69830eca0334519bbdbb2bbdc511db6e6abffe48c78870fef131dc34451873775a037634a87f0cd0d06dc1c4bc9404af2a86d7593ae1
 DIST vector-th-unbox-0.2.2-rev4.cabal 1565 BLAKE2B cd49e8c28667981719bb811a0367e47c1a8953be340abc5e9ebb608520e09c292d3e4bffa5059a22d0362778b63d7a77bc78d552f22571ae27c24f726bd095e4 SHA512 c6bf6404e44d0c128a36106916810eb5f21c93cd40593fa3717028c4f36165a3ff33320d853759ad35e3f7665dba57458dc7004d14cce30cd129ef1ee7fc9414
 DIST vector-th-unbox-0.2.2.tar.gz 4864 BLAKE2B 6c7cabc49af5f06332802c41f37ca92a7fc8df48c288cceaee786aaf38b8f19f5576ccac3e86dd04a62431d42c5d1e0bd2269a5b5bf4e6558a2a76810dcba7f1 SHA512 55af4bcced3a39464aca6dca95a8148498a698d9402a583b916aa178d58d3895cc609525416de53c0a39566b892c7b09296fc442db7851a19d071142cce72a46
-EBUILD vector-th-unbox-0.2.1.7.ebuild 833 BLAKE2B 0cc03eb1847c80f76954ac551100cf3189c51c72889859a8f94ce10afac1bda5d99135995d15ebdc0667f44c31cd43477bf529ac86e6e351b3a17247b8d17738 SHA512 755ff12b6a853bbc13cf58e4d0af23688038a9f82866d92a5e4e22190c7fd222af4015e989bd89fbc23746773b8b9e222ee5154c2e0fc4b8f114b71761a425e0
+EBUILD vector-th-unbox-0.2.1.7.ebuild 851 BLAKE2B 93efec39bc59b1774f9400fb991a91ebb7bb7605212cdce95cf52e9f37de06562bb746b733d336f2bd595e5daaa3a91238d4f319805f37a1bba6f7a363bad422 SHA512 91d7d34546e8deb24d25a0bd85d4b518847ccf6e9d1c3958d6567c7319dab3e37985504c3ca25ae15df80b07650b1176f663ec7f44d5e84a7033e50c5534e15e
 EBUILD vector-th-unbox-0.2.2.ebuild 672 BLAKE2B 37e805bcba6416fafaf6bd699d36be28b09570743c267c1b128e46caf89ca86bf0dc4b84a1968e8e7fe75963d8e0fc17f4debc3879d37aac040455afcf6cd599 SHA512 82919031433ed8320008c795ef5a1b809c6654555375f2265ebc7f1d20d464b72c6e3c4c535c9b2197f98157653bf1b8fd9261ddf0d078ba9da1b93d3d1726a9
 MISC metadata.xml 399 BLAKE2B 580ee8b45352f4cf0acb765669d52d2bcf0295affdfdc24dda425c074fba24e7373fadf6b493475c69fe1d1615e3143d990c47a72c3eb6c4ca86dd58a09d7907 SHA512 825d23517a1c4c53428570d34420745befd8ce08badd8f0c0445e826d38f4606d319b677052ead94f2b8f5c3b7ebdb72b558434f0d393bfcd9b3a68192855acc
diff --git a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild
index 4b2513b3ad77..766e7a1673d6 100644
--- a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild
+++ b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/vector-0.7.1:=[profile?] <dev-haskell/vector-0.13:=[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
diff --git a/dev-haskell/vector/Manifest b/dev-haskell/vector/Manifest
index de47c10ed9b5..d83fb17c1fe4 100644
--- a/dev-haskell/vector/Manifest
+++ b/dev-haskell/vector/Manifest
@@ -5,5 +5,5 @@ DIST vector-0.12.3.1-rev1.cabal 7946 BLAKE2B f1545c06c3a2ce405c9bc498e471b640fa4
 DIST vector-0.12.3.1-rev4.cabal 8218 BLAKE2B df9e13b1d98377d6506225e3da5a1834c51d3e5244945a6d02a9267b077a5b1d276410130d7c2860b8d49b23f4d6d63dfbd168b497d9ad439240aed19dd8213f SHA512 86088ff4f20b2cc214a703b7ea665baf6d1e9b218f931c6880d6d1291f0dd8e2804863a251a8bf11e82d2f0026d55dcba06f937f8c8909dc8988bc60874374aa
 DIST vector-0.12.3.1.tar.gz 151420 BLAKE2B 1d3bb37f1c2b7f3c74e8a934d855b0f1742df03f8526a8b7632d1f940abeeef5a03e476340a96840c9486aeafc404463bff078eb28db9176bc8989b554e87ac4 SHA512 bf117d53c7844c010dc1cee8b778851bd714155fd34e671ae2eb7bd324427de972389eb9f3f315832f20e7bbbecc93ec0f6296ab10e4935957d2a4e14c6cfd98
 EBUILD vector-0.12.3.1-r1.ebuild 1212 BLAKE2B dd5bdd5fcd5e235eaedb39b8bf2a888d1eab559005af32dcbe8c63ff7a3132936783c701aaa788b84a5ad26c4d3221011aff82aef3789aa62793294d2febe7e6 SHA512 ee376b94b42b51c3e28e01e83d5511cd5ea127cdbc7d51822b7f4858705662856a8a4d2644e23055da122f68edcdbed1e400e455861c2b9bf53bd465024fa2ed
-EBUILD vector-0.12.3.1.ebuild 1649 BLAKE2B a8ca0a15683e558d6bc718ae09a0579b616f8cf51d5c9e87821792e3a7625dc6d7ff23a94741db29d65dc2d975822b707c1f5f0d3e2f5763abcc223948f0cef9 SHA512 1f4352b396e5982c38186799828fcb4ae14f717af4e58378f4ea06b585103fb429741cadfd20de31bd4f7d556983b1f4064636a8c8e799fe089d32af106b6587
+EBUILD vector-0.12.3.1.ebuild 1733 BLAKE2B 3d56bf53374a3eed94650533db97395875e29026547216e3bf401a375a6c26bfb70c044f8c5c01fcf1854a7302850842f05a1af2d20d2609bd0e6b1ca2283bbe SHA512 b4867585f1e59a5a1617dc27df8576e4f08e0f0b4e4ada6b5866a3ec34991cb24ae4642096c32d62e09848a79d6b16e90db303157add9899f923216b33f49b1a
 MISC metadata.xml 698 BLAKE2B 45f1c24540f2b75537930533243084f7c5fe21c0712e965bf2709c71dc89b22fa5dff17d03b368484d6bc7163a1fe626b5544753ceffc729e27277c0a67547b9 SHA512 9626da7feafe181ef190cfa9e83412ebf8588bb503203f064be13c60362a7ef6ea1a315e388986f314ec1c921ab7c1f8c5d25dd8c80c81d980dc01316c4d19c6
diff --git a/dev-haskell/vector/vector-0.12.3.1.ebuild b/dev-haskell/vector/vector-0.12.3.1.ebuild
index 5608e0226ed9..76e5a4178141 100644
--- a/dev-haskell/vector/vector-0.12.3.1.ebuild
+++ b/dev-haskell/vector/vector-0.12.3.1.ebuild
@@ -33,6 +33,14 @@ PATCHES=(
 RDEPEND=">=dev-haskell/primitive-0.6.4.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
 	>=dev-lang/ghc-8.4.3:=
 "
+
+# doctests do not work on >=ghc-9.2
+RDEPEND+="
+	test? (
+		<dev-lang/ghc-9.1
+	)
+"
+
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-2.2.0.1
 	dev-haskell/cabal-doctest
@@ -46,6 +54,7 @@ DEPEND="${RDEPEND}
 		dev-haskell/tasty-hunit
 		dev-haskell/tasty-quickcheck )
 "
+
 CABAL_CHDEPS=(
 	'doctest   >=0.15 && <0.19' 'doctest >=0.15'
 )
diff --git a/dev-haskell/xml-hamlet/Manifest b/dev-haskell/xml-hamlet/Manifest
index 5e371a74c349..f88ef2457ffd 100644
--- a/dev-haskell/xml-hamlet/Manifest
+++ b/dev-haskell/xml-hamlet/Manifest
@@ -1,5 +1,5 @@
 DIST xml-hamlet-0.5.0.1.tar.gz 9270 BLAKE2B 49b713f45d16451d40d7afa46d045eafc208a56b3299f778950c89daa68c2678a2fb01c9e18d9645e00f3e2173bd1bc62bdd03a9b91b15d2f2d627977cb501fa SHA512 273dbb637c6e37fcc3b180448ccee0dce8996319d653cc3833fef302a297e8fdc805958b4ebc6e015cbfb2ae8b60a8325108b9d6dcaab052b460ff27a404de39
 DIST xml-hamlet-0.5.0.2.tar.gz 9328 BLAKE2B 5a5e4c1a1bd59dbb13d2fa605777cf4b8d9e47b7cbeaa14e65a2e0c59994f083db45320d709556d006e43940d30373d1905bd5166656f0899acda112a6629828 SHA512 3a186ec01dbf5f84b294d5dcf01f595826bbf26d6eb84f41bfa8341a4756a6aeb48f7fd7d1bd4398b74c421ed18a0f5908a49864cca7348d54b50b92cbe93007
-EBUILD xml-hamlet-0.5.0.1.ebuild 853 BLAKE2B cffb4fa341be2eed0d4ea343d194d8bc43beafe9117df47b2eb8545da8bd6de42ea92d1485dbb9d8e5a2100179c77ff4f48bd1e6353f87ec5869fe555781b9d9 SHA512 98dcf1e8559e7e514c5d60d63777c0148fea03fbd47cfd77512be8e8b2d32c060c87a835de066bb1f01719fea407b3f88058fe04df97b36777dbb86961264e12
+EBUILD xml-hamlet-0.5.0.1.ebuild 871 BLAKE2B e324d687e52353bde564d3b4cc54ad53713b10834681a47dd409eb125a836a076d5c8d38efc125c06a70cf3bbd5a4399b1bab26272014eb00141ff2cdb4a5893 SHA512 0c26a95f6ca69ad4f75221ebf4a5bb9da3a8ae15c78ba4c1c857c0958aec5266ea1738088e86deec8599d8754dc262254bed2548094b348635affba8cd8215b8
 EBUILD xml-hamlet-0.5.0.2.ebuild 794 BLAKE2B e146315827a41a496b7476cc84d18aa9ee4d11bb41110595c8dd8526448d9d7625ca78550978b46fd088002ced0f0a6501a6f000a4807213571dd70ad5734a04 SHA512 3d26a1986e96dd576f7ad0cce8f1c8f6bc007ca4c94b65d81ee8c2ee24b4950841bfb7f3657e2d0fadd4d1ecef9a1fe035a7b8871121d45208fd55af2657c484
 MISC metadata.xml 326 BLAKE2B 24beb0fbc50efc6b5d965562f3e61b81e316eb94b9ca004a26e38ea198e4790d66079860ccd038cbccb44fa99010c118137aa62237d5f2830e349a8c90e1f5f8 SHA512 cd5527500fe667a2cc31903d733658095c8a85c4f52c1d55a50476ffc958a28b604b680a7dec430593af358578f7f4e5a000bfc157f1ee41d1879722fb100666
diff --git a/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild b/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild
index a5d0cb7ab77d..61623426f704 100644
--- a/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild
+++ b/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild
@@ -21,7 +21,7 @@ RDEPEND=">=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?
 	>=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-2.2:=[profile?]
 	>=dev-haskell/text-0.10:=[profile?]
 	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.4.1:= <dev-lang/ghc-9.1
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/zlib/Manifest b/dev-haskell/zlib/Manifest
index e6cb618bc9f4..d515d1dec572 100644
--- a/dev-haskell/zlib/Manifest
+++ b/dev-haskell/zlib/Manifest
@@ -1,6 +1,7 @@
+DIST zlib-0.6.2.3-rev1.cabal 5329 BLAKE2B fd3f11e91ea754c34b79be5a194ee05a2d411a4b5c25612840b4f7d729e000218f2065fa57ff8b09c3c2b0b583c1e25de5f90b569d7858a74775da12a1ac090a SHA512 cd09ebae641001cb69d861f4111e7b5ab6a2d51457e39e35cd36d2d30dafae5c788a27bd987665748569e20b13fa80e0784d1fa3b4110cc643031ea32ac20903
 DIST zlib-0.6.2.3.tar.gz 149186 BLAKE2B 5665c6a076c0efdb6074ca72e3723ddeb4a7d851abf06450ccb8a4ee6179c3e45be63c3c620d02787b088a6c18723ba2d5a77c525d59dc4ab9bbe1770e79517b SHA512 535fc711af639967c032791c6a0c09680ac186c706e02a28cfabd9b2dcddc84a6ee5f6007e2ed67c1dc19dd6d561cb821d8840dba7386b63cc002418c4d5040a
 DIST zlib-0.6.3.0-rev2.cabal 5367 BLAKE2B 4fb30c7af39286710ee5925f6e211c69c90b75f17c99f527e62ca4f9b0271544e22cdb4973f35c45524f81ca4401623effcb85830ada0aa5d11880db6d4742d6 SHA512 9f2851974abc0da417afdb914f4ce3d72c5945d23a39685174f40f2224ba5001a94ae9761cf44b2961a8fa135f28c689bcf913267a2b086e73fa353e9dc22672
 DIST zlib-0.6.3.0.tar.gz 369595 BLAKE2B 3a3ecb4ef2cce3332be22a1137b89c3ff27a600326fbc4c53610a588bcfe79f2c3b6916ad68705b7d397c0cc53aaf958a19eccd39edfb66e07b3cfae701d8890 SHA512 95daae13c5d5458fd7c610ce4cc686dc7af477364c4dcf3d31abede84f6e4b4e70ea255f7ded586d46d9bb6298d19c93b8856eec16c6002265ed076e52bf9a21
-EBUILD zlib-0.6.2.3.ebuild 1122 BLAKE2B a0b79bddb095d052dedec585e5f390ef8ed75361c9070ca46c06ce7fd8fdaa0e611cf6a9ee870518f32bd26e655d765e6078a729a89c9d1cda3699592b7436bb SHA512 fe9072cf981af1bea7062407a529297dbeb182bc3645a1d4b9490ccd38939b0985314f90bd9e26ab8a56e26c905984a5c3e79fd021ba046f42137af7c40be319
+EBUILD zlib-0.6.2.3.ebuild 1087 BLAKE2B 2f26e93bca368ec65eac25b87b9ff591c0f25426d3514fb77a75ff2098ed8c5f8fb68def6c31a5cec34f6b1d2a10c399b250672be772130d02d6117a5375daec SHA512 adc01dbc0c37501068d151f764904095ad497afa8c6b9143c9e6ad1d6a9e8c83be45b6feb9568a36aeb58869a11e0be20d865cd13311efce51c17df8f4064874
 EBUILD zlib-0.6.3.0.ebuild 1026 BLAKE2B f17c84228d81136c4654ecdce9fae386d931f7791f50beb3629e751383fe0dca315060ab049e3c256ed67ce89fc9403e9b4406602419d9c743eacf402e4757ca SHA512 8c64065cf6fc60058a9e30d8e9d3cab89baabfb061b3d04cc067348627f288c33f1c0652c7b8a596413900a96c3b231964bd3f6b4b09c96ec4b065c8931821c2
-MISC metadata.xml 618 BLAKE2B e0de3f68e6dfe0a4d964b9480c695904cf4cec734aee9d6ceec3da4bc566da05418fd2f7f4193e9950723463439fd39da003275c9f8199310b844eda6c7de544 SHA512 986a22a5f38235800d687f7bcf519214b1e5701280de78f70fdd83958a330880c28ba3c589adb3215488cd1799dbff8b2a9ccb4fe5b6b6155e98ff606592b86b
+MISC metadata.xml 740 BLAKE2B 8d6db73e5328d20c1c8bce976b808b0508affc8264c3f353a5925daf20e6d3d793625170bc4137f97760c05bf113a23ba86c79be8b2092f9e4722143884f4635 SHA512 8b89f6aa4a633a454b010506e553f2344c8f000fafced9ea8befdd2f0d2c9a113907bf2a3a87daa8b0ffe862c38dfa7bbf21fa18ef3452a2e6f3d21f3dcd1bc0
diff --git a/dev-haskell/zlib/metadata.xml b/dev-haskell/zlib/metadata.xml
index 4c34a34bede0..f4c9b1ea85a4 100644
--- a/dev-haskell/zlib/metadata.xml
+++ b/dev-haskell/zlib/metadata.xml
@@ -12,4 +12,8 @@ For windows, this is the default.</flag>
 prevents other Haskell threads running. Enabling this flag
 avoids this unfairness, but with greater overall cost.</flag>
 	</use>
+	<upstream>
+		<remote-id type="hackage">zlib</remote-id>
+		<remote-id type="github">haskell/zlib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/zlib/zlib-0.6.2.3.ebuild b/dev-haskell/zlib/zlib-0.6.2.3.ebuild
index 240d70743406..fb6a06ff8e42 100644
--- a/dev-haskell/zlib/zlib-0.6.2.3.ebuild
+++ b/dev-haskell/zlib/zlib-0.6.2.3.ebuild
@@ -3,15 +3,16 @@
 
 EAPI=8
 
-# ebuild generated by hackport 0.6.7.9999
+# ebuild generated by hackport 0.8.4.0.9999
 #hackport: flags: +pkg-config
 
+CABAL_HACKAGE_REVISION=1
+
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Compression and decompression in the gzip and zlib formats"
 HOMEPAGE="https://hackage.haskell.org/package/zlib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
author	V3n3RiX <venerix@koprulu.sector>	2023-11-19 23:08:59 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-11-19 23:08:59 +0000
commit	a29a0019eaf0bf87941bdc1d9cd53937685852ee (patch)
tree	64c0a3ecbbede7a93bb6625c84b70668941be13a /dev-haskell
parent	5a31d854eec302fd1efb1466af757e520ae4e1dc (diff)