gentoo auto-resync : 24:07:2022 - 20:54:05

27 files changed, 220 insertions, 216 deletions

diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index d2b8d9405e7b..cc8164c276a3 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index a48babe37b19..214c2439aa97 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -1,3 +1,3 @@
-DIST alex-3.2.5.tar.gz 108531 BLAKE2B 283f8f619f72e72da0786b1f8975b256d4aa0c075be849d50763e7d57201089e2e8c09a59df27f1ff21d90e9fead94e8466ddd63d61a6055fbfb4bb6e18161fe SHA512 5823fb066c5ec67256108cfc1550703b86881f319337922e7248fb33def374f0010c60605538a49cfaaa880b0f73ace9dba6d088c078f3c455c5d9adce2719c9
-EBUILD alex-3.2.5.ebuild 1447 BLAKE2B b5abbbae8f3d437a02c32b9d862d7869fb2dcb55c2d8a918cf4a97ccadcdb013c90f850512fbfcbd1e63b2fd6be3f8ab6ccc6f7087c2915368bb96364432b329 SHA512 4ad0e5d1429d8d87b20d9a2abbeee99568d0dc0e140394702f241ddc9cdf5f11be50d7d9788f756e7da335a3984d7a2417a3491d8de55ce3fb70d9f2819bd155
+DIST alex-3.2.7.1.tar.gz 108229 BLAKE2B 1c1c3488c6e0f559003de5edc1250afdd09098eb4da3414d8c461d03ee5f08b94f80e6f6d32366f6d8d0563a068ee8b2a1c9cb7b78bbbf0a1dcf3767ea448ffd SHA512 f8ff12de874b905449fdda0d704f9e4ac30fa3e60e965f82d7bb2d6e3974cf926f85134d32878c48faf0ec4a002ea7240cf6696e1cbcad25a0eebb9d1850cc07
+EBUILD alex-3.2.7.1.ebuild 1451 BLAKE2B d4394b85d471973c94289456a90b83336f2c7b2dd342d5073f7bdb29a0e25bf2b44744865af4f63ef8a6447bfff86f7eebed130a257f999332407be75cab5746 SHA512 947fb3e242ed1add636df46b0e7a28c644a9502a2ca2a8196804794ff4412f464c5b0032a3bf3146fd8958e834492194e046fc23a645e77e85ab35e9113d3c71
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/alex/alex-3.2.5.ebuild b/dev-haskell/alex/alex-3.2.7.1.ebuild
index 3592bc74fd47..ec1778f3abc6 100644
--- a/dev-haskell/alex/alex-3.2.5.ebuild
+++ b/dev-haskell/alex/alex-3.2.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.7.9999
 #hackport: flags: +small_base
 
 CABAL_FEATURES="test-suite"
@@ -18,9 +18,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-RDEPEND=">=dev-lang/ghc-7.4.1:="
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-2.2.0.1
 	doc? ( ~app-text/docbook-xml-dtd-4.2
 		app-text/docbook-xsl-stylesheets
 		>=dev-libs/libxslt-1.1.2 )
@@ -34,6 +35,7 @@ src_prepare() {
 		eautoreconf
 	fi
 }
+
 src_configure() {
 	# make sure we don't accidentally use those
 	# installed in system
diff --git a/dev-haskell/groups/Manifest b/dev-haskell/groups/Manifest
new file mode 100644
index 000000000000..9009a4f1bd87
--- /dev/null
+++ b/dev-haskell/groups/Manifest
@@ -0,0 +1,3 @@
+DIST groups-0.5.3.tar.gz 3396 BLAKE2B fbd87c5954550de266fcbe176d631577c22ad468a061b01f295d21fb8fcf1b9f218489ffe0962a7b9b04e0a5a2ddbc911158eecd6a4d4a0b0a562a70da8afa1d SHA512 5601e9c44d742dd715016d9d4f69f5033aad332c2a5b47d6e79d51e437d3166b6e8bd975f7e4b44acf6cbf1eb5a1fae021ddfd2058c6cd00b25030f0d7b70387
+EBUILD groups-0.5.3.ebuild 538 BLAKE2B d2228ff69ca0d016752cad97ab87bfd5e380f9b447eac59472a1f092c2f2295f87db470367303006d75d3a7f6d2612248cbc677407b14fef4e9bf5f202d3d90a SHA512 4e9d05256657b6d0cd49f6fc4597e8ed30819ba94bf38bc2622f83a0fdbb28074bdbc46220b3813fda30c2b79d6f463382eacaddd39c5781664181957a8b5fd6
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/groups/groups-0.5.3.ebuild b/dev-haskell/groups/groups-0.5.3.ebuild
new file mode 100644
index 000000000000..3a1556e50030
--- /dev/null
+++ b/dev-haskell/groups/groups-0.5.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A group is a monoid with invertibility"
+HOMEPAGE="https://hackage.haskell.org/package/groups"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4
+"
diff --git a/dev-haskell/groups/metadata.xml b/dev-haskell/groups/metadata.xml
new file mode 100644
index 000000000000..937381521944
--- /dev/null
+++ b/dev-haskell/groups/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/http2/Manifest b/dev-haskell/http2/Manifest
index 0f23f0f9fa59..0fb2fbaceb12 100644
--- a/dev-haskell/http2/Manifest
+++ b/dev-haskell/http2/Manifest
@@ -1,3 +1,3 @@
-DIST http2-2.0.3.tar.gz 5211934 BLAKE2B cc1fad663650eaa1514e5f94737966ac86a92c2cc15f47db06c057a78873ca7d745aa77280cf451e11a9c2e328cad2a89d965bb7502d6b2e0b9b808b88570a8d SHA512 ff5f02c355f9f5c459d94993f05636955f81b91cbdbd4e8c262b56e1fa3846f92aff946f8ec6851ab57ffbb73afb42999cb3597eb250a9e15a8d6788da860b20
-EBUILD http2-2.0.3.ebuild 1170 BLAKE2B fc2187544163af0a1d7e93ead51616ef392604210add258d1b1c55820a4e96b028f27438a770cdc7644a3ad9bb0b6b014a6a0282f103048bf656e3d37db50b15 SHA512 063a552a1489a01c8947aa43526986a065c0c218007d8e6322ae3c0c026fca0c5a736badb161c6a434eb4b1d40f12e29e672add9d76e09fdbab4c4d17a126150
+DIST http2-3.0.1.tar.gz 5556373 BLAKE2B 40daf73f0460ce649d6bed41b9df961b7388f7ac2e67a11aae56be2f31209183e68cef558b7880b87d1a752f96f989779e5ecbf1a86df5bd4ac8443cd476c41b SHA512 aaa32209fb9945cc33c557866acb053df403bbe37c2bd024ac52e7fc6a3e816d0249e48b83e8846017fe0df0998327cf3498f1bc96b57b0fa81ce9c4d35589c6
+EBUILD http2-3.0.1.ebuild 1384 BLAKE2B 9cf01d81a3d3db9afdf1246858ef105c500f4317744fd14e024ad55507f8b81cc2cc03dc068826213cd505889e1be4f52bb204e968656ec285a034bece573449 SHA512 f49eb2abe869cecd97f27e998034f6f21a838f49904daeff5b81221c925155a70e78cb4ca10cce016cee4217942358897a7eadf1337b9c80e3e7e25d7c4c1c9a
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/http2/http2-2.0.3.ebuild b/dev-haskell/http2/http2-2.0.3.ebuild
deleted file mode 100644
index e0372b83bcb4..000000000000
--- a/dev-haskell/http2/http2-2.0.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: -devel
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP/2.0 library including frames and HPACK"
-HOMEPAGE="https://github.com/kazu-yamamoto/http2"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/case-insensitive:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/network-byte-order-0.1.1:=[profile?]
-	dev-haskell/psqueues:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/time-manager:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/aeson
-		dev-haskell/aeson-pretty
-		dev-haskell/base16-bytestring
-		>=dev-haskell/doctest-0.9.3
-		>=dev-haskell/glob-0.9
-		>=dev-haskell/hspec-1.3
-		dev-haskell/text
-		dev-haskell/unordered-containers
-		dev-haskell/vector )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-devel
-}
diff --git a/dev-haskell/http2/http2-3.0.1.ebuild b/dev-haskell/http2/http2-3.0.1.ebuild
new file mode 100644
index 000000000000..2e8e06788c55
--- /dev/null
+++ b/dev-haskell/http2/http2-3.0.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 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: -devel,-doc,-h2spec
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+
+DESCRIPTION="HTTP/2 library"
+HOMEPAGE="https://github.com/kazu-yamamoto/http2"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RESTRICT=test # test suite requires too new dependencies
+
+RDEPEND="dev-haskell/case-insensitive:=[profile?]
+	dev-haskell/http-types:=[profile?]
+	dev-haskell/network:=[profile?]
+	>=dev-haskell/network-byte-order-0.1.5:=[profile?]
+	dev-haskell/psqueues:=[profile?]
+	dev-haskell/stm:=[profile?]
+	dev-haskell/time-manager:=[profile?]
+	dev-haskell/unix-time:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1"
+# 	test? ( dev-haskell/aeson
+# 		dev-haskell/aeson-pretty
+# 		dev-haskell/async
+# 		>=dev-haskell/base16-bytestring-1.0
+# 		dev-haskell/cryptonite
+# 		>=dev-haskell/glob-0.9
+# 		>=dev-haskell/hspec-1.3
+# 		>=dev-haskell/network-run-0.1.0
+# 		dev-haskell/text
+# 		dev-haskell/typed-process
+# 		dev-haskell/unordered-containers
+# 		dev-haskell/vector )
+# "
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-devel \
+		--flag=-doc \
+		--flag=-h2spec
+}
diff --git a/dev-haskell/network-byte-order/Manifest b/dev-haskell/network-byte-order/Manifest
index ece616e3157c..902cf2adbed1 100644
--- a/dev-haskell/network-byte-order/Manifest
+++ b/dev-haskell/network-byte-order/Manifest
@@ -1,3 +1,3 @@
-DIST network-byte-order-0.1.4.0.tar.gz 6426 BLAKE2B fc4f414622f8feab70bbc76dec977a591099bf81bb050aa0426791523d75bc4bb7fed877d08e9c55cda881638b47d84beee9a6c5ffbba89a95b3e40afdade3b8 SHA512 b0b9f468df51963bb6ef6cd6dcd90345cbee7ec96686b8c4f5b94639f6a78280f30af55779208a14f468ec9c5509aea0e65865a7e8966f9779d4c0eb83933dc2
-EBUILD network-byte-order-0.1.4.0.ebuild 596 BLAKE2B 88f1339925d8cc891debd23e803a4994bfcda807dfcdd4228cb77f9597548d9030faaccc290ce58c9a9bbd7c0bc7035744f2d05102b0b2da243a206e356c86a2 SHA512 16ac4495c93b54416d7b81c1914cab32e91b77dde9b1a7905f5269d719cd895342d08e0b971ce946d7b9abd9af95fc5a17cac832e92aeab75744ecafb0156f69
+DIST network-byte-order-0.1.6.tar.gz 6648 BLAKE2B 4cacbf0af40b2763663456dbc551da9305e10d80ea2e749214b6617aac8cfdedcf2070c8d9d40d2d37d0886a4d3d43bb58addfce3983f8e402a92e51abca6282 SHA512 bfb15f6e1aa863af7f81dc35518273e936d04f5f9decf6a0938a972dc9780ab5c9c10ed062ea027d1e92aa1e61dfb0059dcbc38324dbd4124f89d08017a2ae97
+EBUILD network-byte-order-0.1.6.ebuild 601 BLAKE2B 41c60087aefbe1e3dfd682ac39f59480c8b4913a525edb5e906bd755fb08a466b500a92e93c36b87ec113381392564e3c9321dc46eced449729fcb4f4d13d0da SHA512 ce803959aabf8e8bed74d72e3438196b1e00ab8fc6ca7939b6216c045039225b9d14ee4f0e22b65e127f48db707a0b1bbd00015712827420e4a3479da4a702c9
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/network-byte-order/network-byte-order-0.1.4.0.ebuild b/dev-haskell/network-byte-order/network-byte-order-0.1.6.ebuild
index 7ca1634286c3..378317c57358 100644
--- a/dev-haskell/network-byte-order/network-byte-order-0.1.4.0.ebuild
+++ b/dev-haskell/network-byte-order/network-byte-order-0.1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.4
+# ebuild generated by hackport 0.6.7.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
diff --git a/dev-haskell/rebase/Manifest b/dev-haskell/rebase/Manifest
index 81a20c071e45..1b52beb08abc 100644
--- a/dev-haskell/rebase/Manifest
+++ b/dev-haskell/rebase/Manifest
@@ -1,3 +1,3 @@
-DIST rebase-1.4.1.tar.gz 19413 BLAKE2B 965f5633496df14611e496150e3fed91324df7189fd1e6c8ec6c2bf7492287b97c716c7da60f61e36740a9e535daf8ee3f7f6349615055a3ec093e167c825605 SHA512 70bb6513e6ea6a1cd3adf077fe454cf4f1a3b220224fc76e3d63050f17c22cc2d218efa8803f269a3605cb0b95e7ea11b3e8b55ec80cd7fb2db4dbf330739a18
-EBUILD rebase-1.4.1.ebuild 2186 BLAKE2B 38260ed79e87c79f6d05a06806842932f09b9165e6caaf9a3800c9f0349b87e0d255df2f934476412494c153076c33fca31beddb9d10f60611987420eaa2c83f SHA512 9aed2662cc3b70af4d702bbec1d73c233b62124f8b17e61100933a8a1f412e75a87f8dedd8ffe8ba3b30e5902e0999d2e0eee69f49447b3dec29968060226e70
+DIST rebase-1.15.0.3.tar.gz 21149 BLAKE2B 9999de56996d719410e770c5970a4e29bb81ac81a254440df7cd6ae001a2dc12bb5d69f47630e8e33941f0934d830f27594be23768f4317145655cfbb4fe859c SHA512 46c5790ba0bcf39b17a98eb32e6c5f68125abf9d20f51b6c3fa4fab665790eb1148878631e1e38677f53e1d81d52a1a96db18a8aec6e0eefbdacdd611340067a
+EBUILD rebase-1.15.0.3.ebuild 2097 BLAKE2B 2810812d36eb821dc4ef83ce2f4cf19191d4734a7d060ede3f2332375b5bb5a8fb77ba2cef60cf7d0ea1b7ecea575d7a00cbdd1760016084c911b3406bdcd19e SHA512 e13aad75ff90e90bf1a614f4bc7fd3523d79cd8757110908c1e9156abcda4666ae95cebca83626a5bf6871817bea62a784231924ea1645bd4460e5844007b28f
 MISC metadata.xml 1137 BLAKE2B 0d69fcb4a70f9279380191c6e39a622e75ec062452204869e2bd5f5931327bd7c76e31c5316242ea08816118795c449f54b19cf47c7884481ff047e510b62c87 SHA512 d1cf24ea34ead7c0d74bdcae14c6ea2b86e0574bcae3d1ec93e8ac8fd425934ab2215435f95215ed4e5e0ad6fb2ecb99dde5d92c6477aa883360c5e5fcc522a1
diff --git a/dev-haskell/rebase/rebase-1.15.0.3.ebuild b/dev-haskell/rebase/rebase-1.15.0.3.ebuild
new file mode 100644
index 000000000000..75e505e5a20d
--- /dev/null
+++ b/dev-haskell/rebase/rebase-1.15.0.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A more progressive alternative to the \"base\" package"
+HOMEPAGE="https://github.com/nikita-volkov/rebase"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-haskell/bifunctors-5.5:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?]
+	>=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-5.1:=[profile?]
+	>=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?]
+	>=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-1.1:=[profile?]
+	>=dev-haskell/either-5:=[profile?] <dev-haskell/either-5.1:=[profile?]
+	>=dev-haskell/groups-0.5.3:=[profile?] <dev-haskell/groups-0.6:=[profile?]
+	>=dev-haskell/hashable-1.3:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/invariant-0.5.5:=[profile?] <dev-haskell/invariant-0.6:=[profile?]
+	>=dev-haskell/profunctors-5.6:=[profile?] <dev-haskell/profunctors-5.7:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/selective-0.5:=[profile?] <dev-haskell/selective-0.6:=[profile?]
+	>=dev-haskell/semigroupoids-5.3:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?]
+	>=dev-haskell/stm-2.5:=[profile?] <dev-haskell/stm-2.6:=[profile?]
+	>=dev-haskell/time-compat-1.9.6.1:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.13:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/uuid-types-1.0:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+	>=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/vector-instances-3.4:=[profile?] <dev-haskell/vector-instances-3.5:=[profile?]
+	>=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/rebase/rebase-1.4.1.ebuild b/dev-haskell/rebase/rebase-1.4.1.ebuild
deleted file mode 100644
index 7aa91c52580e..000000000000
--- a/dev-haskell/rebase/rebase-1.4.1.ebuild
+++ /dev/null
@@ -1,45 +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.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A more progressive alternative to the 'base' package"
-HOMEPAGE="https://github.com/nikita-volkov/rebase"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-prelude-0.1:=[profile?] <dev-haskell/base-prelude-2:=[profile?]
-	>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/contravariant-extras-0.3.2:=[profile?] <dev-haskell/contravariant-extras-0.4:=[profile?]
-	>=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
-	>=dev-haskell/either-5:=[profile?] <dev-haskell/either-6:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
-	>=dev-haskell/hashable-1:=[profile?] <dev-haskell/hashable-2:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?]
-	>=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/selective-0.3:=[profile?] <dev-haskell/selective-0.4:=[profile?]
-	>=dev-haskell/semigroupoids-5.2.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/stm-2:=[profile?] <dev-haskell/stm-3:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/uuid-1:=[profile?] <dev-haskell/uuid-2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-"
diff --git a/dev-haskell/regex-compat/Manifest b/dev-haskell/regex-compat/Manifest
index 8245b48c0a5c..b11b3715f074 100644
--- a/dev-haskell/regex-compat/Manifest
+++ b/dev-haskell/regex-compat/Manifest
@@ -1,3 +1,3 @@
-DIST regex-compat-0.95.2.0.tar.gz 4019 BLAKE2B 13825a59d2edaf5df3c4726f3b040d9354eaa95220cc907a74e5141aa95d2299107bfaa5037d327011bc3ccf3f0aeeb00ad9bd086e20b393eb898a19a46e5ca1 SHA512 8b1b421f5e7688a1d4a61711a255505a047e90e9f9283a8cf2ebfa9774631e8fb3a071d61877ab22548a0c63e30237603196f043dac9cb64da4df2fdc4422300
-EBUILD regex-compat-0.95.2.0.ebuild 933 BLAKE2B 2ea181743394a31b4eb53402704e772ae465dd4950f7f3d7bdcd49c5d3c2f7876cbc8266bdfcbcea4792849ac40fe5e77a28535db1a69990f7de0fe6f28a9e16 SHA512 0c6d363bc9c037fb87c3063cdb3662947893590959cb6ef3c5d34a78b71082f12b6d7e881acdaba81865457da0dc83c7e59c85714a34826ef9e778e94c4a3a42
+DIST regex-compat-0.95.2.1.tar.gz 4285 BLAKE2B 5b1b7adf71c2903bf6647cc0bfefae230f59dbd3ab655a03083f279e7557b533ab745c15e36c51dcd6c4da9239e49a85c64a37a50458ee1a20e0d33a5abecc38 SHA512 87a671729dcdb2c89ce079fbb124cd2f16407f2dca0ed5d0d898a9cf06f893b82c184566efe80d966afbc7dde2cab1693b81516adc4832a9c65283a65fecd919
+EBUILD regex-compat-0.95.2.1.ebuild 834 BLAKE2B b51a703093b46e675d750bfdc45bf3e779d306f5194e3c031212558c2e002c61cd2ad2134b22a2f00f3d549f05dfcb490bea6d7e12920bec862b7608a4957ab9 SHA512 6157d70563cd0be73e0fd6fda7325e9898bc524e21465b8e089bc5e5aac328686fa8bc03cea2b079316b98bcf8bcf41afedfa152bd781220b7e01d706d1f24b2
 MISC metadata.xml 308 BLAKE2B 0a9963e4eecbb0644fe45a944e127eec6ba5594aae29ecf22f83ab8723fedeeec3e7b46cf3c2cb008b2f262898c52bf6dd6403390c3fbb397fa25d31e39abe81 SHA512 d1ff415536abae9d9fad3c5129e8efef94dd5989395b8f8016c913fee07d1e7243eacfb3170b37848a68818f4e50629aa9cc64fee67570140eca8ecee79a6fd8
diff --git a/dev-haskell/regex-compat/regex-compat-0.95.2.0.ebuild b/dev-haskell/regex-compat/regex-compat-0.95.2.1.ebuild
index ea2e40edd74a..f554a29f8648 100644
--- a/dev-haskell/regex-compat/regex-compat-0.95.2.0.ebuild
+++ b/dev-haskell/regex-compat/regex-compat-0.95.2.1.ebuild
@@ -1,38 +1,30 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.1
+# ebuild generated by hackport 0.6.7.9999
 #hackport: flags: +newbase,+splitbase
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://hackage.haskell.org/package/regex-compat"
+DESCRIPTION="Replaces/enhances \"Text.Regex\""
+HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND=">=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
 	>=dev-haskell/regex-posix-0.96:=[profile?] <dev-haskell/regex-posix-0.97:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
+	>=dev-haskell/cabal-2.2.0.1
 "
 
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base        >= 4.3 && < 4.14' 'base        >= 4.3'
-}
-
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=newbase \
diff --git a/dev-haskell/rerebase/Manifest b/dev-haskell/rerebase/Manifest
index ebd2b052bf33..b7ed1e44b4fc 100644
--- a/dev-haskell/rerebase/Manifest
+++ b/dev-haskell/rerebase/Manifest
@@ -1,3 +1,3 @@
-DIST rerebase-1.4.1.tar.gz 17185 BLAKE2B f474bc24f974698da9a9185a0ea2f352664a36628cf7f7a3483a6ddaebd2521498de1abeb6832e90c0810278a10c887aa9835bed6ed4a0ef93e6f5bda8081adc SHA512 102e88858f46d57a59c830a32f6bbd1644b5c36b7addf591b296ae5f1b7bc0d225d6ba6996d518dc0e67858b10863fcd561cdec0294fd798cb71cd3b8dd34c32
-EBUILD rerebase-1.4.1.ebuild 602 BLAKE2B 012b7f48e9e0a3c312948224081e0fe20e87e94f22af5ea6b1b9a6998c67bb509f0e251365d75e2d89c33bd8dc835bd83c0b059be3fe191f882e6574f95cc151 SHA512 2f4b8c3f796e6c8e4eecfa0cdb365df69772e65679c38fccd0b757af7ec1351f8a9d82a498534e72b3957495d32e3f354d80b4b9eb1b253fa5a7536fc8cb77f6
+DIST rerebase-1.15.0.3.tar.gz 17673 BLAKE2B 9dd7fe1492a432975522735770a1630d24efe299084e5faf5221946878e3d8c8337dfaae0ddc1db13a56e131e8225a1f8e10f0b84e3c0602277337aecfc3e004 SHA512 7887c40a92a84df9361e7745c001476d6e0984c9da973f841feb3f6a413062d16a5dfe4be3171ee8d0bb96a9554384e831a1a4217eef764b97c726051c22ae1f
+EBUILD rerebase-1.15.0.3.ebuild 610 BLAKE2B 6aa6ee2eb2dffddc6215050a5183499815da0d3a4a575729501a1855009a062ce40ced3e8a1ba4054f9901178ee303d1a0d947ea81cd53fac2c3e34510400cc5 SHA512 e7e7722354b0ccf1b003b7ee809bb04ecae3e9afdb53b37f33a1b6a32ac11e6b2c754dd51accca042d254053a7e1f848bf124041fd578bde02c08e88e52cae65
 MISC metadata.xml 447 BLAKE2B 75567e7540165104416ff0e3ecf2dc74e1ba0ca6ab3d179d13d0f0f24a0e075b2256dd0b3e9aaba7568d38e397ef7b867896ebae02eb026e52d35e03cbd4f7a2 SHA512 74035333714d957c1a1700c346b3647a65533613dea3a5bef634fa4e790797012a0dca14096bb5fb7ba2fd42c5210f7d4c4424932bc92bad722bbc3d61987f9d
diff --git a/dev-haskell/rerebase/rerebase-1.15.0.3.ebuild b/dev-haskell/rerebase/rerebase-1.15.0.3.ebuild
new file mode 100644
index 000000000000..40ba9652c4c0
--- /dev/null
+++ b/dev-haskell/rerebase/rerebase-1.15.0.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Reexports from \"base\" with a bunch of other standard libraries"
+HOMEPAGE="https://github.com/nikita-volkov/rerebase "
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="~dev-haskell/rebase-1.15.0.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/rerebase/rerebase-1.4.1.ebuild b/dev-haskell/rerebase/rerebase-1.4.1.ebuild
deleted file mode 100644
index bdbac1e730ae..000000000000
--- a/dev-haskell/rerebase/rerebase-1.4.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reexports from 'base' with a bunch of other standard libraries"
-HOMEPAGE="https://github.com/nikita-volkov/rerebase"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~dev-haskell/rebase-1.4.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/selective/Manifest b/dev-haskell/selective/Manifest
index 641ffd16e703..0765a65bc0bf 100644
--- a/dev-haskell/selective/Manifest
+++ b/dev-haskell/selective/Manifest
@@ -1,3 +1,3 @@
-DIST selective-0.3.tar.gz 29161 BLAKE2B 786df49e4c05a53537e34f4ab4ba56075166140cee721db1ff517dfcfea92889a97dc3c558877a4a4c91a390e1cbcf684ddb6c2287079cfabeb75f19f3be7c35 SHA512 ecc5777c4692680032c2b758c0447200df3f42d4c97de0aef3d732d38c0813f85fec2d6f9825b044cf20e918631ce649b6f6cc932580277f50692ff609973dc6
-EBUILD selective-0.3.ebuild 772 BLAKE2B a5af12f5cccd1408f41a3ad38c44f76282e0f2499b2323fd9e366921a6517cbdc50cc04a0ac286ef1f52ee2c76205d6d285ef398274b3ba28476be326e15b5cb SHA512 3a114db6564127c2d1cd2076d3e78185234481ed118bce78f0fcd78740fb1ce5311c1fbeec97953331646a7f26d96bae9f1d2bc55607538dd1cd77ea773b6579
+DIST selective-0.5.tar.gz 34055 BLAKE2B 1cd2af69e0590c04f41b5473595579c0eb494a70167a7a06986930a6a28cb254dc971ae08451a402e6e1e1b9925cf6a96fdbffffe885888d97da667929c8da22 SHA512 31c7d294fe0cf92f4c4b57008d9dea055e959906eb0a8d11873edc0e02430dbfec99a57b68ee9c98d332c92c9c5111e03b2b4ce89d3dc543243b343a37313d6d
+EBUILD selective-0.5.ebuild 612 BLAKE2B fde8d0e50ffb23d0e957ad559769a879cef08960bd073a67dacb0dfb62b4c3c9b862993b4de1aa80c2085da42a5345f37dde5c578fb76dc493942258a4697dcf SHA512 58f654e1107f8cdd7a75b47832ee079846e45c64d1b33a3f75a09b7eaa807a54fcce286ac8cf3fe805ea80262dd54d8850c168c5a3c27c82dabd199708ea9f16
 MISC metadata.xml 657 BLAKE2B 92ff4b5dcff32658a237eea31f5ddd21bc1fc8d5a7459f9acfdd44b18451b6f99fe877b272c91de1e62862eb33544caf77d70f7a8bce2a4eaa2eb743b37d6e84 SHA512 e529dca1d1ad98db3e9516349fb245393d10173f0279442454ea5c44b215cf80739d7e60c2022ef8f38ee7a824f1bbe72642265256cb0bf255c13693a3cdadc0
diff --git a/dev-haskell/selective/selective-0.3.ebuild b/dev-haskell/selective/selective-0.5.ebuild
index 86949794165c..abde0721dd40 100644
--- a/dev-haskell/selective/selective-0.3.ebuild
+++ b/dev-haskell/selective/selective-0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.3
+# ebuild generated by hackport 0.7.1.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -15,15 +15,10 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND=">=dev-lang/ghc-7.10.1:=
+RDEPEND=">=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/mtl-2.2.1 <dev-haskell/mtl-2.3
-		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14
-		>=dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-expected-failure-0.11
-		>=dev-haskell/tasty-quickcheck-0.8.4 )
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15 )
 "
diff --git a/dev-haskell/shakespeare/Manifest b/dev-haskell/shakespeare/Manifest
index e6a39e67e989..13a676905662 100644
--- a/dev-haskell/shakespeare/Manifest
+++ b/dev-haskell/shakespeare/Manifest
@@ -1,3 +1,3 @@
-DIST shakespeare-2.0.25.tar.gz 65816 BLAKE2B 65bf2313e74de6516fd0fdde91986e9ded0e8cbba46273402f296fc1a824893725c8b618cdfd1c6194d6b49b303c6ee8cbafd42fc3ffc70e7b9d56f7267d6eb3 SHA512 26805c070c712a7bd549a2923f7b39cf9eaf7c9a3451c0c672eeff3b22e4d3f696887f3846e39c73f1c0add6a21becae9e58bb2821c0158298e105e0a1bf8ac2
-EBUILD shakespeare-2.0.25.ebuild 1269 BLAKE2B feacdc8123834c236bd1e4932345715bbe2e3b3e8f7dcf15ea5ba4c7b679339a75df0913f749160f97d98b6e242951ffd0369d11f9e274f8ae7fed81ffb809c0 SHA512 d8a183302fe65a95fe05979ccb15fa7ceefdc1c2002f99cda29a1ba0f26b1aa48f4a953288ad576b0cfcffe81790ac84b9eba87ef17d9ca3da768a65e25f6f45
-MISC metadata.xml 1035 BLAKE2B 9aee089c2038c63d1247e17eb54aee9be649fcfdfd68d3f3f75cacc9421e86b99cb687f23d3c5c9b7e917581d548fca3cc27996dcde194f31a705cbec84389fe SHA512 6c7d62cf7c1f698242ef640ab99877cfb781a08aee2c1c58c452a6ca35e3d65ba117eedfb25958614067ee93c9ef31d618ef26a15db86a206c13dff4d7f5d609
+DIST shakespeare-2.0.30.tar.gz 71263 BLAKE2B a3ef788611b83d27d0e188cb11b45e54f5e7ce1ff215c3f62d643f5725022b8e7b3f94af7ce35fe5471311b01b9b6ff532fb6fec5ad4059a6d5be31f65f2b122 SHA512 8b278c712f0e914dee2cb2736f6d859e920ffdd3ffbeb2684eb45d3eafced4bf871cd5f960e31b9355d53f913fee29611f82494ec7b26d8711a2b33ef5a0aca0
+EBUILD shakespeare-2.0.30.ebuild 1161 BLAKE2B 7e15d5ae77c9e9006fc642b678fd0a9f6f965408bce26dd12652504e6220e2716263e5f80b6aa599c103a9983b6214896b87d2d69a8f2b153fd5353f1190fc69 SHA512 d2aaf4bf410cb970afef82f44c62769604a0a6184746fc2131f9aab8827a30a497704e6a9da3d3a0bc121218376ca16daed91513bc9174fd997da3495b379061
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/shakespeare/metadata.xml b/dev-haskell/shakespeare/metadata.xml
index eda9c06ca0a8..937381521944 100644
--- a/dev-haskell/shakespeare/metadata.xml
+++ b/dev-haskell/shakespeare/metadata.xml
@@ -5,17 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
-
-		Note there is no dependency on haskell-src-extras.
-
-		packages that use this: shakespeare-js, shakespeare-css, shakespeare-interpolated, hamlet, and xml-hamlet
-		Please see the documentation at &lt;http://docs.yesodweb.com/book/hamlet/&gt; for more details.
-	</longdescription>
-	<use>
-		<flag name="test-export">Test export.</flag>
-		<flag name="test-coffee">Render tests through coffeescript render function.</flag>
-		<flag name="test-roy">Render tests through roy render function.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.25.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.30.ebuild
index beb62cf019ba..e87d52952eee 100644
--- a/dev-haskell/shakespeare/shakespeare-2.0.25.ebuild
+++ b/dev-haskell/shakespeare/shakespeare-2.0.30.ebuild
@@ -1,43 +1,40 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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.7.1.2.9999
+#hackport: flags: test_coffee:test,test_export:test,test_roy:test
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="A toolkit for making compile-time interpolated templates"
 HOMEPAGE="https://www.yesodweb.com/book/shakespearean-templates"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="test-coffee test-export test-roy"
 
-RDEPEND="dev-haskell/aeson:=[profile?]
+RDEPEND="<dev-haskell/aeson-3:=[profile?]
 	dev-haskell/blaze-html:=[profile?]
 	dev-haskell/blaze-markup:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
+	>=dev-haskell/file-embed-0.0.1:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
 	>=dev-haskell/scientific-0.3.0.0:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
 	dev-haskell/th-lift:=[profile?]
 	dev-haskell/unordered-containers:=[profile?]
 	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
+	>=dev-lang/ghc-8.10.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
+	>=dev-haskell/cabal-3.2.0.0
 	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
 		dev-haskell/hunit )
 "
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag test-coffee test_coffee) \
-		$(cabal_flag test-export test_export) \
-		$(cabal_flag test-roy test_roy)
+		$(cabal_flag test test_coffee) \
+		$(cabal_flag test test_export) \
+		$(cabal_flag test test_roy)
 }
diff --git a/dev-haskell/warp/Manifest b/dev-haskell/warp/Manifest
index 167dac0ba1b2..54f68e2d2e16 100644
--- a/dev-haskell/warp/Manifest
+++ b/dev-haskell/warp/Manifest
@@ -1,3 +1,3 @@
-DIST warp-3.3.13.tar.gz 64719 BLAKE2B f9430b22fed524cfa8b90ec3ead31f8c86c74a5b5b967503dcc682a31da8880814856f37c4612d16a873ecdb6faf21dbca1af28c1e1f22942fa258c3b828c326 SHA512 ac37e1f274d26b2c846429960074d27010c0864efd87da6d79f03e3f833aca3269176bb99301ab8cb59c4476ff12bae35b26e0fe602e7b0e2cad2837592e07b1
-EBUILD warp-3.3.13.ebuild 1952 BLAKE2B b760612c951dcb3600dcc2ae00f37cfe022ea804c2f0d614b4d6db3de2bd4e3e2f6320479e5ca43cc14e032bf7573a7d3d992c435cc2678854d8467e894ba39e SHA512 f92beb0177918ba19d1a99c4e7d2bde1a9f1e8baae31f3f8e8139873cd22f623295a483889ee7c413805819c54d510ab20758583458ce3b6f33f6dce84849b90
-MISC metadata.xml 676 BLAKE2B 45f8be517828e9c41c944e52d0fe735b3edaae4816b1634e3fcd11e920559bcacfb94e15a93baac0709a58a0442463a7c6d35ffdbc85981d258653bb900568a0 SHA512 53b02379b2d0c351dbad67d42a619232bfb70677ff1663655ebfeee9394ced574afdd6f03a349190d0f823511c41ea4b4e753988f3ed4bdd15ddd1ceb9b3dd36
+DIST warp-3.3.21.tar.gz 66529 BLAKE2B e8de94a4695c42a7620c1afa1a38225f6c26fc454235e941e34b65929a733e160781d895335d0ab48c4d7db25aa650d50e1d84a3ef83daf62b22f409c2045d48 SHA512 7f181669d9f10f88d14f8f1dc3acb6c08f41c8f4565f371f7fe4b89b3fde411a0190e50f003b07a239ba25ea71dbafaa16cb9e77effbe574bec929ea29646f37
+EBUILD warp-3.3.21.ebuild 1877 BLAKE2B dcf8551a63593cec5fd516c91163b08075a911f430f8b6cecc714e7343ef9e365e9415d4a5b58d7c6d47c7ed2d198992512f8a916257996d44fbdb3a81125b34 SHA512 168aca1c082d5ceb457acfddf8c124375322dddde406daf80769d53ea435ad30deddb5c7fa8e7b2cc095614d90da3bb09451e60153fedddb06fcd93444e5536c
+MISC metadata.xml 544 BLAKE2B da146cfd44d715b28d49623ba26eed7389d9a2f2cb571fa73f47be5e0cdcac35e025d2700edf818d4bd3c9f2e91b225d30b07181f5c6868d2b97dd4d9d0bb7b9 SHA512 45dbef5dfc796a988272944afcd5d0f0dc46137cda51a02b2200874687f471832a4d58c07e031e386a3676d45f9078b6d936aeceed7add0e3e8d93fe9c5da070
diff --git a/dev-haskell/warp/metadata.xml b/dev-haskell/warp/metadata.xml
index e7c2731d2b2e..990528df1e4b 100644
--- a/dev-haskell/warp/metadata.xml
+++ b/dev-haskell/warp/metadata.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The premier WAI handler. For more information, see &lt;http://steve.vinoski.net/blog/2011/05/01/warp-a-haskell-web-server/&gt;.
-	</longdescription>
 	<use>
-		<flag name="allow-sendfilefd">Allow use of sendfileFd (not available on GNU/kFreeBSD).</flag>
-		<flag name="warp-debug">Add additional debuging information</flag>
+		<flag name="allow-sendfilefd">Allow use of sendfileFd (not available on GNU/kFreeBSD)</flag>
+		<flag name="x509">Adds a dependency on the x509 library to enable getting TLS client certificates.</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">yesodweb/wai</remote-id>
diff --git a/dev-haskell/warp/warp-3.3.13.ebuild b/dev-haskell/warp/warp-3.3.21.ebuild
index 23fad6252f66..71a0e7aea898 100644
--- a/dev-haskell/warp/warp-3.3.13.ebuild
+++ b/dev-haskell/warp/warp-3.3.21.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.7.1.1.9999
 #hackport: flags: -network-bytestring
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
@@ -16,39 +16,35 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+allow-sendfilefd warp-debug"
+IUSE="+allow-sendfilefd debug +x509"
 
-RESTRICT=test # requires network
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?]
+RDEPEND=">=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?]
 	<dev-haskell/bsb-http-chunked-0.1:=[profile?]
 	>=dev-haskell/case-insensitive-0.2:=[profile?]
 	dev-haskell/hashable:=[profile?]
 	dev-haskell/http-date:=[profile?]
 	>=dev-haskell/http-types-0.12:=[profile?]
-	>=dev-haskell/http2-2.0:=[profile?] <dev-haskell/http2-2.1:=[profile?]
+	>=dev-haskell/http2-3.0:=[profile?] <dev-haskell/http2-3.1:=[profile?]
 	>=dev-haskell/iproute-1.3.1:=[profile?]
 	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/semigroups:=[profile?]
 	>=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?]
 	>=dev-haskell/stm-2.3:=[profile?]
 	>=dev-haskell/streaming-commons-0.1.10:=[profile?]
-	dev-haskell/text:=[profile?]
 	dev-haskell/time-manager:=[profile?]
 	>=dev-haskell/unix-compat-0.2:=[profile?]
+	dev-haskell/unliftio:=[profile?]
 	>=dev-haskell/vault-0.3:=[profile?]
 	>=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
 	dev-haskell/word8:=[profile?]
-	dev-haskell/x509:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
+	>=dev-lang/ghc-8.6.3:=
+	x509? ( dev-haskell/x509:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hspec-1.3
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( dev-haskell/async
+		>=dev-haskell/hspec-1.3
 		dev-haskell/http-client
 		dev-haskell/hunit
-		>=dev-haskell/lifted-base-0.1
 		dev-haskell/quickcheck )
 "
 
@@ -56,5 +52,6 @@ src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag allow-sendfilefd allow-sendfilefd) \
 		--flag=-network-bytestring \
-		$(cabal_flag warp-debug warp-debug)
+		$(cabal_flag debug warp-debug) \
+		$(cabal_flag x509 x509)
 }