gentoo resync : 24.07.2021

29 files changed, 77 insertions, 106 deletions

diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 57da1d936079..19b42dd92c1b 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/binary/Manifest b/dev-haskell/binary/Manifest
index 602a5687f497..55e9f886a940 100644
--- a/dev-haskell/binary/Manifest
+++ b/dev-haskell/binary/Manifest
@@ -1,3 +1,3 @@
 DIST binary-0.8.7.0.tar.gz 57443 BLAKE2B 27d892ff28410e37fa9c8f3b852bf6c420fee8c7241815737c7c488e0e1754685ad4efe6a93eed055638870c0b64dc311e1c6e6bc6bf498420f1640557d4ef27 SHA512 2648ea70b6615c01a0e336b3fc187ecb0ad298c620df056da250fa237a2614d23f2ad11a0b11216d799aabb107f89b89d8e63daa30868bf8829ba358b9586aff
-EBUILD binary-0.8.7.0.ebuild 938 BLAKE2B b9aaff5d7d6d5ebf3ed55234e29b1d4a3e688069d7a9895d95e96857809a802a5fb05c6e78283913f4e14f384eac75b7289f74ad680839412dd2569086514341 SHA512 9b3210bede51a5d766ef8b751ce00e3a3f399751ab80aa9ee37541029e3361cdc1c77ba124a0f4021788b5d613bf5a6f588870237353236862c7394cb3cc3eb2
+EBUILD binary-0.8.7.0.ebuild 950 BLAKE2B fe86503232513fbcb944054b41e209fc6eaf9fb7a51e9a1908e15986eb18c92881ed17cdebd6fefa345633e916374f5d4bc7c7c92aecdfe9ed942e6a7f2e11fc SHA512 a3787355a0acbf4ea532f480752ae95e9def0f08b5ab62ed0b4ff3ea2bacfe270fa71cacb0994965efc80c041e5da4c994f9e771ba4fb9ecb2f3b0e978574880
 MISC metadata.xml 677 BLAKE2B c28648a0dd6140c8763a604e7976bfc20b9b8174dabb66a63d64df2947ac5ad3d5ceffeb6c60143a88c1328f2b822505e5938161654246c3e33ca0cce4a8e811 SHA512 0b2e3503d82f796a6c3bef7dcaf307de19b3f7d0081690971e0b5f9c9b49451260e87d25e0bd2e311f1249ed111568bb62b246b6a1510b16138c6788aaccb563
diff --git a/dev-haskell/binary/binary-0.8.7.0.ebuild b/dev-haskell/binary/binary-0.8.7.0.ebuild
index 5755eb819db0..a77c059d3e0b 100644
--- a/dev-haskell/binary/binary-0.8.7.0.ebuild
+++ b/dev-haskell/binary/binary-0.8.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,4 +28,4 @@ RDEPEND=">=dev-lang/ghc-7.8.2:=
 DEPEND="${RDEPEND}
 "
 
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha1 PM:9999"
diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index eeb731153a32..aa85fc9181dc 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1,7 +1,5 @@
 AUX cabal-install-0.13.3-nopref.patch 775 BLAKE2B c2c9478da820ffd22ab5450a38f54d74249b8b5000732be2e9cb68229876cdd50062ad7a668bef860be53161b2a820d0e31e3701f5c5f28602e964267a8ad30b SHA512 e0abaebca3d85bf09cffe76a7cdc0dc4df9ef7d0b13950932cbb0bedaeea59173cbf28b2a89f3f1b9e8ea15cb5c611678cf79ea63ea5a3f5acb4417082de19e5
 AUX cabal-install-3.2.0.0-rankntypes.patch 415 BLAKE2B 8a0459bac359c3f53750f50131e8fb0fa30ae5346ab718f0471959b543d17c91a691649066349ea129777bfc238dcc66ef4df6b222e5e76ae65ccbef863a57b1 SHA512 1b650dcef65df682b7058f67d43664910f8ffdf558a81d1df033080df1255460e45a3685b5897129339c00fe20d8cff23e1b3d5bc0f08c041b4e177fac9fe9d2
-DIST cabal-install-3.0.0.0.tar.gz 654045 BLAKE2B 5036948651098b83f073b5ce29e2aaa31e4382f07e8b1e79d206889bd9c74fb88789f4b1cbb3bddc6d03375a6e3a3e164d6bda4ea19e3f944904ab11d7693fce SHA512 0b15313fc11bc6b6018e01b6a3a65242306977c16ce9333ea1191c1ce0020b180451235a7a65b47bc01791e05d1b246bf9d573fc7e981a46fcfc7da0fed04cca
 DIST cabal-install-3.2.0.0.tar.gz 632084 BLAKE2B 55cdbddebed17489f1c031bd867de7868878aa289193b826dd8274860e4f08d48f71cad33af1b62da16f71629ae4ff5745c3ceeada1680dbcc222793eba49a06 SHA512 ad937b2df42b688e4608aa2b91a25daf1042e5573626202e5182cbfeca9acc5933194853405a6396c60d0d28d6d0d5c5276fd85cb6acf4be2c8cd12afe747062
-EBUILD cabal-install-3.0.0.0.ebuild 2474 BLAKE2B 30b95a329b7af6a57e1d3fd59dbf468f7addb010556e7dba0be7c51ce103b79f6f4abb640ac57fbd73a52dfb360e857c868cad5738dae9ee16e8b669bc19b468 SHA512 967298ab3af7495f4338763da78b5dcfeaed058740883ae54ebcda868b3307c16dd26f9277a7cf3dcc6a26cf4c697d34b354c6c49325c94c8c402c2d579c0a78
 EBUILD cabal-install-3.2.0.0.ebuild 2539 BLAKE2B bf9f97243a4f0ced09975d9f081e6bed4b697621e3dbc6413fb1f1490442502cfc4fd42abb4ad485a7a608ee34ac20a16b55f6405610d26d95542d3a414d76b9 SHA512 6456dd630f610b61be70aaa052497204062db38ba151f508e183b8fdcb9ba31ba3cbc57d14c2d0ee627fc595df585a7e7e59613b9bdee3925229018ba17ce683
 MISC metadata.xml 606 BLAKE2B c3d2bf45b3a96dc8d7245cccbeee3a49ba328afa5ce5efb1feaa6d76dec8063156c10451b65fb946a4de0c96b719ceb00e958400f607845d17df4ee8c7746681 SHA512 33177964ce5c096ea1d1557c3f2500ed999df3a4245a55d73c7b2ec04d42444089502de367f4b6fd84bf3c4012c7d430706b36f76461d6f1c5c6dc957dd2003d
diff --git a/dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild b/dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild
deleted file mode 100644
index 6e85d8ae9421..000000000000
--- a/dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2.9999
-#hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions
-
-CABAL_FEATURES=""
-inherit haskell-cabal
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-# keep in sync with ghc-8.8
-KEYWORDS="~amd64 ~x86"
-IUSE="+native-dns"
-
-RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
-	>=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:=
-	>=dev-haskell/binary-0.7.3:= <dev-haskell/binary-0.9:=
-	>=dev-haskell/cabal-3.0:= <dev-haskell/cabal-3.1:=
-	>=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:=
-	>=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:=
-	>=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:=
-	>=dev-haskell/fail-4.9:= <dev-haskell/fail-4.10:=
-	>=dev-haskell/hackage-security-0.5.2.2:= <dev-haskell/hackage-security-0.6:=
-	>=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.4:=
-	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:=
-	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:=
-	>=dev-haskell/network-2.6:= <dev-haskell/network-3.2:=
-	>=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:=
-	>=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:=
-	>=dev-haskell/random-1:= <dev-haskell/random-1.2:=
-	>=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:=
-	>=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
-	>=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:=
-	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
-	>=dev-lang/ghc-7.10.1:=
-	native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >= 4.8      && < 4.13' 'base       >= 4.8'
-	#if use noprefs; then
-	#	epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
-	#fi
-
-	# no chance to link to -threaded on ppc64, alpha and others
-	# who use UNREG, not only ARM
-	if ! ghc-supports-threaded-runtime; then
-		cabal_chdeps '-threaded' ' '
-	fi
-	eapply_user
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-debug-conflict-sets \
-		--flag=-debug-expensive-assertions \
-		--flag=-debug-tracetree \
-		--flag=-monolithic \
-		$(cabal_flag native-dns native-dns) \
-		--flag=network-uri
-}
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 62dda66713cb..7b14c86afd73 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,6 +1,6 @@
 AUX cabal-2.0.0.2-no-bootstrap.patch 255 BLAKE2B 49b913ac6c5c43c92aab70abfb39059731f636e3a23064c7ca5d8773b28409fc834b480985d9ac4b402af5c4dd6c11000f6d7f90fd8b7c2d2268789764d4522a SHA512 b09d267b1099233aa0fc2a17afe3ade979f263f113ae3b70c5f2e9663c1a88860ca09fdbae489779851efab07f897579714da80a955e9a70f30ad0811f168c9f
 DIST Cabal-3.0.1.0.tar.gz 758808 BLAKE2B 9a0cf7b055be4d6fa55c4dd44037263df54eff059cd22970383ffa1470317cdaeac8d81a521f8c48cf595fc22e64da031d508f6d2b58f32a613160b3e0cfcd67 SHA512 29a5ae9bad0398ab86c64cba9fb1ae3094d67013151a91c8c25b0e95b08d8fd683d1e85b064f7faf166966f855b261d2f131b727c82476a8514119a8922a6b06
 DIST Cabal-3.2.1.0.tar.gz 823331 BLAKE2B 060f4808010f9eefd943312144c75e021bf02083c2a0805128da6c9b93da94ba13fe37cef1fbe27e41fe8a10610e088b923783f4b7bb57150532d3a3ea4a91fc SHA512 279088a2ab9145efc03dbdd10941edcf6034137046ee3b659a8cf0ff075a03e3edff28fd01d432d39701c5a7e05a50b99cf8de95f05d3bd4e75edb3af0e3a598
-EBUILD cabal-3.0.1.0.ebuild 1369 BLAKE2B a26e0c15af1fb6105768853eb790b19ddc8ef81a00de8bfaaf0aae45d2a410c0810ad46463cb66818372cb8cc56dd8b128d311a90047d001ca21a77afbd0e0a6 SHA512 e2da6fedf6e901f1bd5cd36a8aba2bc625d19c14d18233e433153f36ab1e7b2dbf1926be87956d64a3faa0ec3249700655f21be1bc6fe019098a0f9ed57df722
-EBUILD cabal-3.2.1.0-r1.ebuild 1886 BLAKE2B 6542138f6e409fdfe899c6ddd37e1d60a2fb1155203754e73f0e8cc9c3189310a32054fef5213df0e6802c911fbd75a1cbe3b2612461396681fd846a40dda9fc SHA512 79583918d97430ee4e11636a371d5b8c00a414ebb4450de0cceeea8bb7b7a1d2df6aacadba0f13afd9c91d53645620e651200e62dc882316a580d41c57818c42
+EBUILD cabal-3.0.1.0.ebuild 1381 BLAKE2B 8d0dba2e416ab0faa788e32e28d1375ea8f3135e77df31840ba240fa3cf41ab1917e53fca2d272bc3cc67a55caa3f12ca003350767e43191863929f91c0b2f6d SHA512 5714c3777575b90d40bccff1915bcd8ed382fbfe3efd6cd300dbacab5ee078bc562c040616b49dc5f3860dfb25fd08b07e506b8fa78b568b94ab211ecaedc4a1
+EBUILD cabal-3.2.1.0-r1.ebuild 1899 BLAKE2B c727a43c6727b22a134de6f5b40f7772cdd083ef3e2a6d72c7c6a5262da358359968346131bd023de02b2b41520dc68dfc370c1928a0f16fb60198bbd33e4777 SHA512 c3cdb628ed7c9b02d1bad31426a5b1cc4b4f01fd99cb765c5ed4fe600f447b4313169015ac931859e9a088ca125fda6d69cb5102f20c81352997177651e7dd67
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/cabal/cabal-3.0.1.0.ebuild b/dev-haskell/cabal/cabal-3.0.1.0.ebuild
index ec738e686df4..7aa96e571d2a 100644
--- a/dev-haskell/cabal/cabal-3.0.1.0.ebuild
+++ b/dev-haskell/cabal/cabal-3.0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 PATCHES=("${FILESDIR}"/${PN}-2.0.0.2-no-bootstrap.patch)
 
-CABAL_CORE_LIB_GHC_PV="PM:8.8.2 PM:8.8.3 PM:8.8.4"
+CABAL_CORE_LIB_GHC_PV="PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1"
 
 src_configure() {
 	haskell-cabal_src_configure \
diff --git a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
index d18123f7001e..0e4d42da0f0b 100644
--- a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
+++ b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
@@ -51,4 +51,4 @@ src_configure() {
 		--flag=-bundled-binary-generic
 }
 
-CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9999"
diff --git a/dev-haskell/exceptions/Manifest b/dev-haskell/exceptions/Manifest
index a3c9ab0b9ad7..1068957b6e34 100644
--- a/dev-haskell/exceptions/Manifest
+++ b/dev-haskell/exceptions/Manifest
@@ -1,3 +1,3 @@
 DIST exceptions-0.10.4.tar.gz 20819 BLAKE2B 16873edfeb540ddf5b950f81772c7d162e3fc37d286dcf6608c4c3017516a4255fb7cad247025aa9b0970508613038a3d0b42eccf22e74a0c4efffdfa22be5d3 SHA512 3df1edb4abab8e2e2dbd7387809d9768efca36c6840225ce33bee8679a4efdcf86d28beafb54a9a40e512163e4d088f94e788341bf614869bbdbd9d701bca4a2
-EBUILD exceptions-0.10.4.ebuild 1381 BLAKE2B 6721fd21f0528cd5416e00704e3b3d752805827834a7e2315d448e0d6d4170e643a6f3a270d517c870af94da5ebb85ecbe4466b4c66676d8c08fa240b5294cfa SHA512 350b63b4abbca67f9297d8b256eaa12514769d67ab8a72abf03844b91e0da8b172e925706dff1c13b03a234fed48361083674b6effb8db038d2f8ec77679187d
+EBUILD exceptions-0.10.4.ebuild 1406 BLAKE2B 4523042016334e1330ca1ee9fc26f21469eef63ab6cef23a6b2a036d548511a88ba045b733c3d724dd26b93e840b7c3483cf0466d79d5b351c5967e8e9774ea5 SHA512 044671597a69b30dcd8a13727bf9cd04e672a2591f6b7eaba4ef383fd27f865d343efa665a68029d76e948e224f93bdf94c08dff7590438d8a45f011212a8f70
 MISC metadata.xml 331 BLAKE2B 9bd180046d711ccf8021146ef216091dc6017e0c6a406c69eb15feef48d6242d53bea9ec43e975d64770b55c200a36c4f8fd595ae883dc041cf2a75b8a87d02b SHA512 205022d21e7c1fb5b6507b2807b6fa59cee4c7736a6ad1ebefe052052443e87fb8bebb8a8f283612811a777c2b7f8c210f4cc30db399c81e147ae0e220bd58f6
diff --git a/dev-haskell/exceptions/exceptions-0.10.4.ebuild b/dev-haskell/exceptions/exceptions-0.10.4.ebuild
index 987428590228..bfc8bbcbe39c 100644
--- a/dev-haskell/exceptions/exceptions-0.10.4.ebuild
+++ b/dev-haskell/exceptions/exceptions-0.10.4.ebuild
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
 "
 
-CABAL_CORE_LIB_GHC_PV="PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:9.0.1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
 
 src_prepare() {
 	default
diff --git a/dev-haskell/haskeline/Manifest b/dev-haskell/haskeline/Manifest
index b041b2d78571..6447354f4c75 100644
--- a/dev-haskell/haskeline/Manifest
+++ b/dev-haskell/haskeline/Manifest
@@ -1,3 +1,3 @@
 DIST haskeline-0.7.5.0.tar.gz 66156 BLAKE2B b8b2e589681255572393f07d3794647d657d4992979dcf1c6a3eb073dc3b5cfc6ad182b7cb2a7b9ee5b54da797b6a79d710974f2a46068fdea411fa4fdd5086c SHA512 624b102fe2446f347fb8b0f1027dcfcffc47c7ccceb900357aa3d17a1303b25480189c25dbb548d2dd303fe7577e54eacdd232c2dba143e6c8ac4d7e5fcf0b27
-EBUILD haskeline-0.7.5.0.ebuild 1023 BLAKE2B c96cf5336f95e68466c744ddd7d40b7b5db60b84d77fc88149e0c6e85f27b4d88c46417da8299c24c54a1e6a1f7e954c5517aaa1c4f6284914b5fe41494f97d6 SHA512 1b30ce1e6aa13af6913ce09c00f44b8666aa095c1791a3e96e4538377647a175677034482426cb452e38d0edcaaac5480c3f50499591914b50aa8f6d0f04ce38
+EBUILD haskeline-0.7.5.0.ebuild 1035 BLAKE2B 7db977505bc7a19b9c3771a339bc9bbf5f95b29f6d07fb24cc783f4a42af3c8feeb00c91a70774792313e6faf0aca3f5a410791526a1c6be850852b2797e08fc SHA512 e64950846cff597ab4904b381166f07960310fe48f93e3724d27f5b380fd68cdf4a2b0ecf0ddfd986cdf0e541de968903441e81d9c052c0d95495a1d3eec2e28
 MISC metadata.xml 759 BLAKE2B 65db68f050406f7d67549c7ee59445c0048ccc8ef3d841fc0da8b03c20f30b7984c1bcd673890e304f64ab8dbfc6fd666d86282e96c22b0111a19fd8025f512a SHA512 ce39f6d65cc0830be627f0e79086c454fe55e371c70f1ebc18bf850c7490409f557d371d3b0fdf40cfb11dd31de561f515a3b78c2f6aa56de39d865b33bc481d
diff --git a/dev-haskell/haskeline/haskeline-0.7.5.0.ebuild b/dev-haskell/haskeline/haskeline-0.7.5.0.ebuild
index ea4773a729a8..2a793ea65887 100644
--- a/dev-haskell/haskeline/haskeline-0.7.5.0.ebuild
+++ b/dev-haskell/haskeline/haskeline-0.7.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,4 +38,4 @@ src_configure() {
 		$(cabal_flag terminfo terminfo)
 }
 
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:9999"
diff --git a/dev-haskell/language-ecmascript/Manifest b/dev-haskell/language-ecmascript/Manifest
index 5bd2116bd48e..a63e90fe6530 100644
--- a/dev-haskell/language-ecmascript/Manifest
+++ b/dev-haskell/language-ecmascript/Manifest
@@ -1,3 +1,3 @@
 DIST language-ecmascript-0.19.1.0.tar.gz 56091 BLAKE2B f7f84703aaf6962164b8bfda5fc5ac624cd27e325b77db45cef058bcdb447fa54aa3462eb1ec6ef8318c6663418cfe5459880f31ba97fb89ecc0be97d6757e86 SHA512 07a562af8dcdb72f86466c2cd066252e289bfc253cefdec756dd68cfc4db867b9951ffde4d0edae492cd78feae426796273667a8fcdbf182489aaed415abb2b2
-EBUILD language-ecmascript-0.19.1.0.ebuild 1531 BLAKE2B ea67e3c16a44ecfa58b06f9414e4c8b6a1da8a81d6b659133475a9383b35f136bc83b862b4310f772a8f7514751a57e48273b322386bf405af5b61ab85c5c205 SHA512 14bd9d947d5078bf6e2a608e26dd3b88e36cea1f21ed66ff17f73c90ca88a5139fd4f1e60ae800091759c98a586d03ae4aea5076915026abf0cff211e6d7a78c
+EBUILD language-ecmascript-0.19.1.0.ebuild 1650 BLAKE2B 0b1fc08a2f01e93905bf650cdafecef735481934946ec1c73f039d172ed9dbba2cc9e1b8c6aa4b956d3b557be47fb7b3a5cd831f765779d83894773efdb6ca8b SHA512 d42ab2e2b9b3f448ce238b18da5a1013eb2459abdc7ac4e68188dea2367bc404daecd524fc06e2422525d7ed2afd49e47cfa8f0e086493d9472fcd05fdca0498
 MISC metadata.xml 596 BLAKE2B 787ae6259b762c93911394e5705222432772e615b6fc3c74a193d65d6f95a5f28e2020f9df5bb091a8aea0d0d16e15a58b2cddc490d2200a7af3dd4d7cddfd31 SHA512 5d34b8f0d441df1eb10c5bfaeb8b18d018c579b8d25d22ba50f87bf9f850c0309f9f5964f0ee5e2ccfb8447f8411dd1b18fac62a44c09db2223f1b29a3ddde80
diff --git a/dev-haskell/language-ecmascript/language-ecmascript-0.19.1.0.ebuild b/dev-haskell/language-ecmascript/language-ecmascript-0.19.1.0.ebuild
index 9029755ed411..7d0cfedf528d 100644
--- a/dev-haskell/language-ecmascript/language-ecmascript-0.19.1.0.ebuild
+++ b/dev-haskell/language-ecmascript/language-ecmascript-0.19.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,3 +35,11 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-quickcheck2-0.3.0.1 <dev-haskell/test-framework-quickcheck2-0.4
 		>=dev-haskell/testing-feat-0.4.0.2 <dev-haskell/testing-feat-1.2 )
 "
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4 && < 4.15' 'base >= 4' \
+		'base >= 4 && < 4.14' 'base >= 4'
+}
diff --git a/dev-haskell/mtl/Manifest b/dev-haskell/mtl/Manifest
index 019d50c2b795..d295c8a6a794 100644
--- a/dev-haskell/mtl/Manifest
+++ b/dev-haskell/mtl/Manifest
@@ -1,3 +1,3 @@
 DIST mtl-2.2.2.tar.gz 16966 BLAKE2B 29755d32aa2b0107e512ab6fff1e2695076217d81d3d46276aa2610b7054c98c01b44611b50a0127f277b54d74e0d812e52b3ae2667bf1c2913e1276993fb5d4 SHA512 25aa48f53d9b1da04bb82d9eefff2e5f797a54bc0b22d6465fcef3bee8da0a459e714f4daf69669cc28a8fef5d638d8f9b1407dad2260d67d5a63e1cc324fe7c
-EBUILD mtl-2.2.2.ebuild 921 BLAKE2B 6ce035f4a361e8d9daff8aab62718fb0366896ab010ed29c09712ac402ac4977201371de349befe2edc62fd95aea8ca3e0e6b8bde14c5482ecdbeadd2577dba9 SHA512 085a41929ffb0befab24b067f39b633b5fd21ce2b6ae766f50ca876bf0dd8d108ed17c997d304424adf39bd8f2c55ae8b20ee37be2f02f2408b8f871b0e18151
+EBUILD mtl-2.2.2.ebuild 981 BLAKE2B a646f1d2d867d76d6a16a566253081c6d3b1bd86ca35e980d251b0658ec182876d50deff88c7589af416e7a0c2c235cc72b5c82cfc76b220f4b1c44733b04253 SHA512 524a711120d379fbe769dc99054fe927f302e8f07d47b5f69ecc8722ea6262799ac6f7d84808b87a7edcaf89f45f37661e1e32061a320edc7b961385d2d0198a
 MISC metadata.xml 693 BLAKE2B da27e97919715cacee75756746262ee8706cd83f26967cf33bba060e85034cbc546a0c52093ba34dc9db7faa81db2fe0162adf4882cfb6fd7d86137915721ff9 SHA512 3f98568414ef1de6679c4d8a1f381bba6eff560b889830d711578252feb9dae978a60fdfd7e84f5ba71d09a2710a21cd464e1735b5bd139462d12694df8be781
diff --git a/dev-haskell/mtl/mtl-2.2.2.ebuild b/dev-haskell/mtl/mtl-2.2.2.ebuild
index 573ea637bf81..83bb28e42722 100644
--- a/dev-haskell/mtl/mtl-2.2.2.ebuild
+++ b/dev-haskell/mtl/mtl-2.2.2.ebuild
@@ -24,4 +24,4 @@ RDEPEND=">=dev-lang/ghc-7.10.1:=
 "
 DEPEND="${RDEPEND}"
 
-CABAL_CORE_LIB_GHC_PV="PM:8.4.2_rc1 PM:8.4.2 PM:8.4.3 PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:9.0.1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.4.2_rc1 PM:8.4.2 PM:8.4.3 PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:8.10.5 PM:8.10.5-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-haskell/parsec/Manifest b/dev-haskell/parsec/Manifest
index cae581a8a374..47097f38b5a6 100644
--- a/dev-haskell/parsec/Manifest
+++ b/dev-haskell/parsec/Manifest
@@ -1,3 +1,3 @@
 DIST parsec-3.1.14.0.tar.gz 35688 BLAKE2B 474b14ff35d332339ce07f09ef22cbbdf971de9d9712848eb1c67b7ea4359e46079b67d39f978755c7560c55baf6d5f0d69a425291644a3ff638139a8bbec3ce SHA512 db14f77a2d36da5e540be35f0facb7fa61f2c46057b98039bdf16c06fe9865d5ee47e3523a312201665ca133f3f93855b42f0d0a920b8e233ffc8274075c56d3
-EBUILD parsec-3.1.14.0.ebuild 1291 BLAKE2B abb8b57888a9486b05189997f79df5150116b0419a9b02dd9343d9be143e5df0a93da82fce38401aa9ee60d167b33e0ef0c5f36149df28359f46a9650b259d34 SHA512 d339cf1ae10a6e6d30983bc404cbf0d634a33f04a832ef24490200aa39c7843025dcd9fd4266820fe227392ca1f87d88696f5f3a25234a44fe06dc956e689da2
+EBUILD parsec-3.1.14.0.ebuild 1328 BLAKE2B a0f0d1ed8373ffb1b1df7b5888cacf9e53bb386ad7fc186559faf62d04e949dfa6f21778a7098c82615f0c860b74d3ae0361e37aff233d2d9a6439678a6cdcb6 SHA512 4a2b4f2470e8187466ebc0e506843df67c09d2417e37511c2332198b75b49808980466884af0865e79ed7b4fa027751c651a2f36b400f0f7d8e110f596a2c57f
 MISC metadata.xml 636 BLAKE2B 546955f2794df86c208026c6b3705535af628a8603ba09e942655c268684bf19e30f7c7b6b2965985cb5b8397a9e58ff278261bf08800f6ba7f0d2a74989d7e8 SHA512 ac9389b16e95e34ddbbcbf567449f2cdbd2247a2e419c58d8d07de32a782e29153271da8e80e4382f61e3af469894f80926acbc7f01ea172b53916cf1b32003d
diff --git a/dev-haskell/parsec/parsec-3.1.14.0.ebuild b/dev-haskell/parsec/parsec-3.1.14.0.ebuild
index 0743f353eaf9..d2120fe88cb5 100644
--- a/dev-haskell/parsec/parsec-3.1.14.0.ebuild
+++ b/dev-haskell/parsec/parsec-3.1.14.0.ebuild
@@ -31,4 +31,4 @@ RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
 "
 DEPEND="${RDEPEND}"
 
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:9.0.1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-haskell/stm/Manifest b/dev-haskell/stm/Manifest
index 43b73fa7ef6d..f28c547b303c 100644
--- a/dev-haskell/stm/Manifest
+++ b/dev-haskell/stm/Manifest
@@ -1,3 +1,3 @@
 DIST stm-2.5.0.0.tar.gz 12335 BLAKE2B 4b29efdb620e0528a42a34e0b98e2ba5a7e90f83009e1129f923a77abc427a5f0e3a32255f908d9771406983bbdfab6b9887b031cee7c1a98c99a7d810cccd0d SHA512 64516ff5eba42a469046af51f12cb55afca795c7a897b9ac16c3446d547ad3894d9b80be3716e86291825e8fa91335ee89e9c9c6738c95f3cbd8ee0739236651
-EBUILD stm-2.5.0.0.ebuild 869 BLAKE2B aaaea38e81f75b43e27a7828418acef8a0919f5b07594d9aaab0975fd93c07f5e39a16e2347fc71f99bb24065fc0169b595b14e26619d1613524ab5ae55a3435 SHA512 24c4c6a92fbd5e2d6f84e4da1184b24db457bb573688d73041a6a866f39d9f90f9d8e6031914422ca8fe0fbb77b55ca5b479a8415b3c3ba5502e63d629d00fad
+EBUILD stm-2.5.0.0.ebuild 906 BLAKE2B 938fbe2455e7d5d15edf0d232b2e421b6285d2a54ea71cc50bb4865d06ca45271e141a751ab8a8ff4434172262e80a876012e678cef69d084533b4a65418667a SHA512 18477fd2c44c5ec4007c082c4fdd2ab7bd02200aa4b3d9f97456e8dae5d22b402ccc388d209326be9876c16c496c31957d7772b717bf1c78666b88832896bfc4
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/stm/stm-2.5.0.0.ebuild b/dev-haskell/stm/stm-2.5.0.0.ebuild
index 8a5b50e5bfc9..5a143f915cf1 100644
--- a/dev-haskell/stm/stm-2.5.0.0.ebuild
+++ b/dev-haskell/stm/stm-2.5.0.0.ebuild
@@ -25,4 +25,4 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
 "
 
-CABAL_CORE_LIB_GHC_PV="PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:9.0.1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-haskell/terminfo/Manifest b/dev-haskell/terminfo/Manifest
index 5a59232e3762..3c8fce77bb0c 100644
--- a/dev-haskell/terminfo/Manifest
+++ b/dev-haskell/terminfo/Manifest
@@ -1,3 +1,3 @@
 DIST terminfo-0.4.1.4.tar.gz 42234 BLAKE2B d20920290bb865982d3dac1647a7bad8d75dc7782db249286fa0fcd70ba1bf532da174bc0925f13c6870a2949c7d3b033656c13f5906f09000ba7d89ace4102e SHA512 3006b7c4a0628cb0f28cfb9af8172410a194ee9dc24e1bd121a94d5c5bfbba09ea0b232412eacc7f6705495511077a427ef2aeb7fff2af7cb80e25823aa1667c
-EBUILD terminfo-0.4.1.4.ebuild 733 BLAKE2B 5fbcb308b7f94b5095512221adb5c1172882ad9fa9f712f058c3431f2b4d175b28b8e76999b8ddabadae38dbf943f1e682fee4daec56280076bf81804f73b33c SHA512 91e51e105c1826ff03db92150375b4d34f165bf08172529094443cb9db1b0608e30d6095ee5d024778d84383f10f508ee8b45710eff404033f00a17ad8e95865
+EBUILD terminfo-0.4.1.4.ebuild 793 BLAKE2B 01cd10ce298ac638d7d5c24ec6523033ca7a4fee2a254ee4195e6a46f614b22a881e17f86a3d934923483fe942ad526eaf1e3d16b7d3308fa353ce5f1d413239 SHA512 d7559f37e03109c279c3186bda704d5a21e1259d5265807b93ee6a9623630810e173e96f7ac456a7573839a3e2cb9220031d91e4b62a6a1d469ddb1c35a77ced
 MISC metadata.xml 306 BLAKE2B d582705c23d944c9c5e719cd7e5bd3ec21d51c972a9a6d1745ce7ffe7be67a02cce445aceffe320deceb2a3bd14e259e0f5d0a106f320abb7c8ab8cb6479a3f1 SHA512 265a8a424b9ec088d8f4f0902c294e336b1265a1cb538bf7aca854055a88a2aa2a33c22843b4a98007ff84b6699be0d0e68d7b9e943462a673580f5afd39047b
diff --git a/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild b/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
index f7efeff63931..7fd6206e537d 100644
--- a/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
+++ b/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
@@ -24,4 +24,4 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.24.0.0
 "
 
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:9.0.1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:8.10.5 PM:8.10.5-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest
index 7387f4d6d19b..cddea96d41ac 100644
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@@ -1,5 +1,7 @@
 DIST text-1.2.4.0.tar.gz 171477 BLAKE2B 29bb6738f5c61e13b218cc57cb0c900fce25ecad190315aea4b0a92d5200e2d54aeeae26c8dfc88ddc74706549b820272fdb3877330c8e1e5bd119cac99deef3 SHA512 a4bd566c7d0aea1bfeacf27332e9cff3ad894e7eed9f826b7e4fc7fb85e272164d18a34a81c89dd1ea802951a80ec1d82000ebef05748d419ddfff792c4525e3
+DIST text-1.2.4.1.tar.gz 148905 BLAKE2B 5e3429e3f83a2c12c5482e342fb4a1846538bdf453df23c2144af01d0df3f5a8b831fd76513aea6e303b5a36b38dec185fedf960060264fc49fe917e30964b41 SHA512 4170d9a463cebfbd80b7902e4d71ed1a1f29db96d2cc9045b79908509a633a239edb3b1ff8dac6970074c4d7e91c552e106756d8142709f8fee3a960428c23e7
 DIST text-1.2.4.1_rc1.tar.gz 166148 BLAKE2B c79bbd90c9ccf99668d5a4f0e66b4c75fa7a531d9851355be8a9d859d99578d2e22977ee9514f1743927a8a4fa49d29c252abc39509dd0b6d09bffd96e1f5289 SHA512 27d014d6b870e6cba16ac4a0ac146872d89c363ad1ca786642554bde0cf3ae4876d69ba8dd2655bbdcb88076bf4f5e13b45929ff86cd2bd90d24e607ad7221c6
-EBUILD text-1.2.4.0-r1.ebuild 1054 BLAKE2B e1b4f3555065e8f6a427bfcd94bfae59e75a6021c702963c01eca3e4e49c454935929890ed02f573b957e57e819df2f6c9b2137146c14c79cea6ac504f3361b4 SHA512 2feacaa426eb9c08e5d177994eb9e6edd435c6347c3d37d7a3d9f1ec0afede59d5fe63c19dfb9314243664c973c10dd3b8dceb59fbb4b63e33daf3fdb8861988
+EBUILD text-1.2.4.0-r1.ebuild 1066 BLAKE2B d764699918b96a033e77780be03558a43b2ddfd82944f63fc12d26f846531b5f2e49c736d12306c590df61fca1950b2e35d79c1cb4540c2837a3de2ada6a777c SHA512 50d1fbc6a5529b69c7b357995975fa7686bed94745a185c92ac7113fbd52da0f698c3071f479807a7111e9267236aa748d284ce61a24591c550c8d9ed5041548
+EBUILD text-1.2.4.1.ebuild 1050 BLAKE2B 73ce55c525264c64ea9e6d56c3032d33fc62d6e93508e55c4464e77d676075b82f649d93a1cd115275d6081d63655bccd4e3f66d307c39925d33776bd5dd66cd SHA512 3eaf5c6f68178dc8609b29266ad570459c9d72b59719ef1da281279be09f3e1d743a0e9985639278474801ace976a29e99e000c8810a8fd12c49383ca6512066
 EBUILD text-1.2.4.1_rc1.ebuild 1083 BLAKE2B 8de8aae0cc9edabd32e4e93860449f5be5fac18c8bdc87a055ca39f1a33f4224679c0169494081942479341774d5e710b78fbf97186ff547c91705d8b5b054be SHA512 92ddf11edd4f4d7b6d05c3b2fff421956e03b24e4f85fe67878b086db943158da395e6b59db34fda70fdd712cbf5b1eb5641cddcbe7f83e4a8825255affe3488
 MISC metadata.xml 1508 BLAKE2B 08f6bc5bf71673da2d537c07ef01ca787dd260e71ec011cb9b8c6940e0e0e5cfeed035a6d61d16bf4ac51eb6d32cd15915e25e478fc9e31c97e1d27fbd959412 SHA512 39745c75fe908c51a4c5a0f67b62c6fe65b41cc783753ba3217481b78b2a76f76d227b800310e67bbe95697bdbfc5594d082c699104eef463740f2e0c9a83c66
diff --git a/dev-haskell/text/text-1.2.4.0-r1.ebuild b/dev-haskell/text/text-1.2.4.0-r1.ebuild
index 32cb6fed33fa..07ef7a22437d 100644
--- a/dev-haskell/text/text-1.2.4.0-r1.ebuild
+++ b/dev-haskell/text/text-1.2.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ RDEPEND=">=dev-lang/ghc-8.8.1:= <dev-lang/ghc-8.10:="
 DEPEND="${RDEPEND}
 "
 
-CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:9999"
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-bytestring-builder \
diff --git a/dev-haskell/text/text-1.2.4.1.ebuild b/dev-haskell/text/text-1.2.4.1.ebuild
new file mode 100644
index 000000000000..e2fd338a0b39
--- /dev/null
+++ b/dev-haskell/text/text-1.2.4.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -bytestring-builder,-developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # broken test-suite
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="An efficient packed Unicode text type"
+HOMEPAGE="https://github.com/haskell/text"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.10.4
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+# break cyclic dependencies, test suite requires porting to >=QC-2.11
+RESTRICT=test
+RDEPEND=">=dev-lang/ghc-8.8:="
+
+DEPEND="${RDEPEND}
+"
+
+CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:8.10.5 PM:8.10.5-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bytestring-builder \
+		--flag=-developer
+}
diff --git a/dev-haskell/transformers/Manifest b/dev-haskell/transformers/Manifest
index 59a421b16ab0..72940836e92e 100644
--- a/dev-haskell/transformers/Manifest
+++ b/dev-haskell/transformers/Manifest
@@ -1,3 +1,3 @@
 DIST transformers-0.5.6.2.tar.gz 42370 BLAKE2B 317c8f557e0e37503546323096a9e2c880dd9331708b80b3041d4caa325b1c863b147abb433c0cdc15b1650a7412cb8579d96a8f819a93223b8588bffb440d8d SHA512 f871a910a5c31af77a4b9711f01b5780b1f657bbce0fb37234c97b8245d8504c514950f9e8673a606405484ae175cdb84c0aee7a05df8712cea02299c652cdf8
-EBUILD transformers-0.5.6.2.ebuild 840 BLAKE2B 521cf4616dca36b71b26f1ed27f79a8fa35d945e8fb234fb6951493646e12ded845388ccd5e80dcd3a1c0200dc9b1f26a79728375fd940924bd26bf81211afb3 SHA512 23f4d62f31f53bf5ba96bdf7f4c375334fbe59948161bbd59b00cfcd87b33cf43db6c42c83299efff0390db7ffbacafa1cc1d747752f7125864797ca1c0ada50
+EBUILD transformers-0.5.6.2.ebuild 877 BLAKE2B 6bb23fd366f738a1c9ef99fe060476ceee6af06a674b30b49d0b7e41bb3e6072ae790958f8798f28bcf5a60ef9bed9f76943344f39e070e4026a36838b453392 SHA512 d0f74fc93b832fb5688eed80bf7abd73065b0669bd20b123a3c0e5b5cea836c531913b28903e338e9a9dd2b7b873bbc442b319331c8486d778e169cab19b0c11
 MISC metadata.xml 877 BLAKE2B 0586dc1fc804e0bde37650495e3edcdc5a8725e34a0dbe9dec382438718c4fda1ee68f9bfe23e3467c8a86dea0b6483007d92648c51ae8339e0eebfd5a8c5725 SHA512 a010fb14b9affd54a82308f792aff1f28a5ed4bbe4f1ac8be99c4d4cbde84b78ad49c71d12979bd40fae84e19a429b93de50c64bb345ca188a16ee375f45ae84
diff --git a/dev-haskell/transformers/transformers-0.5.6.2.ebuild b/dev-haskell/transformers/transformers-0.5.6.2.ebuild
index 2355d6f9f776..df29fa1c9afb 100644
--- a/dev-haskell/transformers/transformers-0.5.6.2.ebuild
+++ b/dev-haskell/transformers/transformers-0.5.6.2.ebuild
@@ -24,4 +24,4 @@ RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 "
-CABAL_CORE_LIB_GHC_PV="PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:9.0.1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"
diff --git a/dev-haskell/xhtml/Manifest b/dev-haskell/xhtml/Manifest
index be5d576125a9..2b52483115ee 100644
--- a/dev-haskell/xhtml/Manifest
+++ b/dev-haskell/xhtml/Manifest
@@ -1,3 +1,3 @@
 DIST xhtml-3000.2.2.1.tar.gz 14647 BLAKE2B e1e0bf0e0f9927fd8299e67925b45caa2f265302ec940c6ec50ee464bb2fecf94d9bd14d4ee5909d7ae1564a71d1891241ecd99598a2a9757aff45b8caee8714 SHA512 0843042fb40e11ad0f47100fbead8a6eadf2d9d1d8d530195cd5100d9a2a9b81a8cf5118bcce40239e5f4fc3875ac7809791b32d19055c6fdf0b4d0cc72b207d
-EBUILD xhtml-3000.2.2.1.ebuild 724 BLAKE2B 06fa8d8e6dfeb5a4e690cf97022eaee020897ce37158fde4554d7add2998bccfe618dd6f08a600b5f1d233bf643a9a585df189f65ce8d6f01394214f6693eff1 SHA512 3d1de8e9797e43f0817bdce3fe75c769abd921c01ef2667918f4c5662e25c6a3079b9f5cc200117d6d6c630690adf944bc7448f15b21a831a338e2e1d405eb58
+EBUILD xhtml-3000.2.2.1.ebuild 784 BLAKE2B 0294cfaf8bf458e604acb0858609ed960602d8b7b10a382af1abfe670a74f607b7499cdba1cf2980a0c58dc10d8e6af629d205c7edfcef9ac6e31fd7da60d5cf SHA512 eb335365d8f39410c78e80c131b7658e89286d626b8981cb72ee49331df0eec151208b43153b52b2afeb2efa69b1e843f07b7090c1f8b501025887cf6967197c
 MISC metadata.xml 305 BLAKE2B e7048400b3dc0c789dbb2c34c23f18373deee9b55f53ae669b3d55f1aed654e486fc258fffe9f733fa688600069420adc0496627ced8d08084e7774e5dbe5b70 SHA512 0270a7ac1593d87c819597c6adf0c5658415e1338423c2c1cf254c8d2b9edb879b7776114600ae034b4b667ea42b53b1c372e8fc09c944a017303bbe04ea3453
diff --git a/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild
index 373bbe200864..984aa1b8eac1 100644
--- a/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild
+++ b/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild
@@ -21,4 +21,4 @@ RDEPEND=">=dev-lang/ghc-8.4.2:="
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6"
 
-CABAL_CORE_LIB_GHC_PV="PM:8.4.2_rc1 PM:8.4.2 PM:8.4.3 PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:9.0.1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.4.2_rc1 PM:8.4.2 PM:8.4.3 PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.8.4-r1 PM:8.10.1 PM:8.10.2 PM:8.10.3 PM:8.10.4 PM:8.10.4-r1 PM:8.10.5 PM:8.10.5-r1 PM:9.0.1 PM:9.0.1-r1 PM:9999"